diff options
| author | Tom Rini <trini@embeddedalley.com> | 2009-04-03 14:34:10 -0700 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-04-06 14:33:26 -0700 |
| commit | da82d156d7c2503696ea21cba1e86b261f4a7c92 (patch) | |
| tree | d6ec93bcc78d99e8546e079483628d439a597a8d /recipes/meta | |
| parent | 439e60b246bcc741e883372f2340fc6ab7af93d3 (diff) | |
meta-toolchain, canadian-sdk: Move C++ headers into the correct location, bump PR
A gcc that has sysroot support expects that the default C++ headers
(iostream, etc) are in <toolchain prefix>/include/c++ while regular C headers
are still in <toolchain prefix>/usr/include.
Acked-by: Florian Boor <florian.boor@kernelconcepts.de>
Acked-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Tom Rini <trini@embeddedalley.com>
Diffstat (limited to 'recipes/meta')
| -rw-r--r-- | recipes/meta/canadian-sdk.bb | 8 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain-fso.bb | 2 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain-gpe-sbox.bb | 3 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain-gpe.bb | 3 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain-neuros.bb | 2 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain-openmoko.bb | 2 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain-opie.bb | 1 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain-sbox.bb | 1 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain.bb | 6 |
9 files changed, 22 insertions, 6 deletions
diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb index 150c75222b..9126c7e872 100644 --- a/recipes/meta/canadian-sdk.bb +++ b/recipes/meta/canadian-sdk.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native zip-native" -PR = "r2" +PR = "r3" inherit canadian-sdk meta @@ -100,6 +100,12 @@ do_populate_sdk() { # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so + # With sysroot support, gcc expects the default C++ headers to be + # in a specific place. + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/usr/include/c++ \ + ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + # Fix or remove broken .la files for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ diff --git a/recipes/meta/meta-toolchain-fso.bb b/recipes/meta/meta-toolchain-fso.bb index fbfbb0a2cd..4873c429d3 100644 --- a/recipes/meta/meta-toolchain-fso.bb +++ b/recipes/meta/meta-toolchain-fso.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" TOOLCHAIN_TARGET_TASK = "task-fso-toolchain-target" TOOLCHAIN_HOST_TASK = "task-fso-toolchain-host" diff --git a/recipes/meta/meta-toolchain-gpe-sbox.bb b/recipes/meta/meta-toolchain-gpe-sbox.bb index 74ba03825f..29e39c541c 100644 --- a/recipes/meta/meta-toolchain-gpe-sbox.bb +++ b/recipes/meta/meta-toolchain-gpe-sbox.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-sbox \ @@ -9,4 +10,4 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb -SDK_SUFFIX = "toolchain-gpe-sbox"
\ No newline at end of file +SDK_SUFFIX = "toolchain-gpe-sbox" diff --git a/recipes/meta/meta-toolchain-gpe.bb b/recipes/meta/meta-toolchain-gpe.bb index bcfb1e1b38..7b962bf9f8 100644 --- a/recipes/meta/meta-toolchain-gpe.bb +++ b/recipes/meta/meta-toolchain-gpe.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-x11 \ @@ -6,4 +7,4 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb -SDK_SUFFIX = "toolchain-gpe"
\ No newline at end of file +SDK_SUFFIX = "toolchain-gpe" diff --git a/recipes/meta/meta-toolchain-neuros.bb b/recipes/meta/meta-toolchain-neuros.bb index 087ddcb325..445a187825 100644 --- a/recipes/meta/meta-toolchain-neuros.bb +++ b/recipes/meta/meta-toolchain-neuros.bb @@ -1,6 +1,6 @@ # Toolchain for neuros-osd devices -PR = "r4" +PR = "r5" TOOLCHAIN_HOST_TASK = "task-sdk-host \ qmake2-sdk uicmoc4-sdk" diff --git a/recipes/meta/meta-toolchain-openmoko.bb b/recipes/meta/meta-toolchain-openmoko.bb index b7e5626f61..b265615700 100644 --- a/recipes/meta/meta-toolchain-openmoko.bb +++ b/recipes/meta/meta-toolchain-openmoko.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host" diff --git a/recipes/meta/meta-toolchain-opie.bb b/recipes/meta/meta-toolchain-opie.bb index c72208c822..9f4b9ac6d0 100644 --- a/recipes/meta/meta-toolchain-opie.bb +++ b/recipes/meta/meta-toolchain-opie.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-opie" diff --git a/recipes/meta/meta-toolchain-sbox.bb b/recipes/meta/meta-toolchain-sbox.bb index 1283c599c6..0138329d82 100644 --- a/recipes/meta/meta-toolchain-sbox.bb +++ b/recipes/meta/meta-toolchain-sbox.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-bare \ task-sdk-sbox" diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb index f892d22fd1..b641be1295 100644 --- a/recipes/meta/meta-toolchain.bb +++ b/recipes/meta/meta-toolchain.bb @@ -117,6 +117,12 @@ do_populate_sdk() { # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so + # With sysroot support, gcc expects the default C++ headers to be + # in a specific place. + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/usr/include/c++ \ + ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + # Fix or remove broken .la files for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ |