diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-06-25 13:11:39 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-06-25 14:54:20 +0100 |
| commit | b8e16403fa5454c1e2839e6595c4032eff770d0b (patch) | |
| tree | 95e6e762c2035b8ee5d26716355491b787131f50 | |
| parent | 0d62b8d9b7d5f005734041221a420b3749d2cb9a (diff) | |
| download | openembedded-core-b8e16403fa5454c1e2839e6595c4032eff770d0b.tar.gz openembedded-core-b8e16403fa5454c1e2839e6595c4032eff770d0b.tar.bz2 openembedded-core-b8e16403fa5454c1e2839e6595c4032eff770d0b.zip | |
cross-canadian: ensure package dependencies are generated correctly
cross-canadian packages need to look for their SOLIBS in the nativesdk
sysroot so that dependencies are correctly picked up and meta-toolchains are
correctly built.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
| -rw-r--r-- | meta/classes/cross-canadian.bbclass | 2 | ||||
| -rw-r--r-- | meta/packages/binutils/binutils-cross-canadian_2.20.1.bb | 2 | ||||
| -rw-r--r-- | meta/packages/binutils/binutils-cross-canadian_2.20.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-cross-canadian_4.3.3.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gdb/gdb-cross-canadian_6.8.bb | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 81e216ffb9..e5453848ae 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -56,3 +56,5 @@ FILES_${PN}-dbg += "${prefix}/.debug \ export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" +# Cross-canadian packages need to pull in nativesdk so's, sorry for ugliness +SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk-pokysdk-${BUILD_OS}/shlibs" diff --git a/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb b/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb index 7dad2a620b..e91e7dca3f 100644 --- a/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb +++ b/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-canadian.inc -PR = "r0" +PR = "r1" diff --git a/meta/packages/binutils/binutils-cross-canadian_2.20.bb b/meta/packages/binutils/binutils-cross-canadian_2.20.bb index 7dad2a620b..e91e7dca3f 100644 --- a/meta/packages/binutils/binutils-cross-canadian_2.20.bb +++ b/meta/packages/binutils/binutils-cross-canadian_2.20.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-canadian.inc -PR = "r0" +PR = "r1" diff --git a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb index ae3aab27ba..8e9e4ce389 100644 --- a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb +++ b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb @@ -5,7 +5,7 @@ require gcc-cross-canadian.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "r12" +PR = "r13" DEPENDS += "gmp-nativesdk mpfr-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk" diff --git a/meta/packages/gdb/gdb-cross-canadian_6.8.bb b/meta/packages/gdb/gdb-cross-canadian_6.8.bb index c2d7f9b266..eab1dde1cb 100644 --- a/meta/packages/gdb/gdb-cross-canadian_6.8.bb +++ b/meta/packages/gdb/gdb-cross-canadian_6.8.bb @@ -4,6 +4,6 @@ DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk" inherit cross-canadian -PR = "r9" +PR = "r10" GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" |