summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-06-25 13:11:39 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-25 14:54:20 +0100
commitb8e16403fa5454c1e2839e6595c4032eff770d0b (patch)
tree95e6e762c2035b8ee5d26716355491b787131f50 /meta
parent0d62b8d9b7d5f005734041221a420b3749d2cb9a (diff)
downloadpoky-b8e16403fa5454c1e2839e6595c4032eff770d0b.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cross-canadian.bbclass2
-rw-r--r--meta/packages/binutils/binutils-cross-canadian_2.20.1.bb2
-rw-r--r--meta/packages/binutils/binutils-cross-canadian_2.20.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-canadian_4.3.3.bb2
-rw-r--r--meta/packages/gdb/gdb-cross-canadian_6.8.bb2
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 \
56export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" 56export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig"
57export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" 57export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
58 58
59# Cross-canadian packages need to pull in nativesdk so's, sorry for ugliness
60SHLIBSDIR = "${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 @@
1require binutils_${PV}.bb 1require binutils_${PV}.bb
2require binutils-cross-canadian.inc 2require binutils-cross-canadian.inc
3PR = "r0" 3PR = "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 @@
1require binutils_${PV}.bb 1require binutils_${PV}.bb
2require binutils-cross-canadian.inc 2require binutils-cross-canadian.inc
3PR = "r0" 3PR = "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
5require gcc-configure-sdk.inc 5require gcc-configure-sdk.inc
6require gcc-package-sdk.inc 6require gcc-package-sdk.inc
7 7
8PR = "r12" 8PR = "r13"
9 9
10DEPENDS += "gmp-nativesdk mpfr-nativesdk" 10DEPENDS += "gmp-nativesdk mpfr-nativesdk"
11RDEPENDS_${PN} += "mpfr-nativesdk" 11RDEPENDS_${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"
4 4
5inherit cross-canadian 5inherit cross-canadian
6 6
7PR = "r9" 7PR = "r10"
8 8
9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" 9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"