summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-01-27 11:13:43 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-02 16:55:31 +0000
commitae21dc189f78e428a5c02ee90605843eacc1eb94 (patch)
treedbe6c253babd63e6b3e7a178992f488f7975fde9
parentaa2c4e3879ec51ea117aa23c4917e9d137371099 (diff)
downloadpoky-ae21dc189f78e428a5c02ee90605843eacc1eb94.tar.gz
external-csl-toolchain: fixes for metadata changes
These allow the recipe to build again: - add compilerlibs, g++, libgcc to the provides - add linux-libc-headers-dev to the packages - in libc-package, only sed the ldd.bash.in file if it exists, as the external toolchain is using that class as well - shift the inherit location of the libc classes, as they were overriding the recipe's do_install - use ?= for EXTERNAL_TOOLCHAIN, so the user can set it (From OE-Core rev: 8fb1c84f4cadf8d7a061fd6d90d270c19b474bfe) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/libc-package.bbclass4
-rw-r--r--meta/conf/distro/include/tcmode-external-csl2008q3.inc7
-rw-r--r--meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb16
3 files changed, 18 insertions, 9 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 440218fcae..4acf91a1ff 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -40,7 +40,9 @@ python __anonymous () {
40OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" 40OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
41 41
42do_configure_prepend() { 42do_configure_prepend() {
43 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in 43 if [ -e ${S}/elf/ldd.bash.in ]; then
44 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
45 fi
44} 46}
45 47
46 48
diff --git a/meta/conf/distro/include/tcmode-external-csl2008q3.inc b/meta/conf/distro/include/tcmode-external-csl2008q3.inc
index 15863651a2..31055dcab4 100644
--- a/meta/conf/distro/include/tcmode-external-csl2008q3.inc
+++ b/meta/conf/distro/include/tcmode-external-csl2008q3.inc
@@ -4,22 +4,27 @@
4 4
5TARGET_VENDOR = "-none" 5TARGET_VENDOR = "-none"
6 6
7EXTERNAL_TOOLCHAIN = "/usr/local/csl/arm-2008q3" 7EXTERNAL_TOOLCHAIN ?= "/usr/local/csl/arm-2008q3"
8 8
9PATH =. "${EXTERNAL_TOOLCHAIN}/bin:" 9PATH =. "${EXTERNAL_TOOLCHAIN}/bin:"
10 10
11PREFERRED_PROVIDER_linux-libc-headers = "external-csl-toolchain" 11PREFERRED_PROVIDER_linux-libc-headers = "external-csl-toolchain"
12PREFERRED_PROVIDER_linux-libc-headers-dev = "external-csl-toolchain"
12PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc = "external-csl-toolchain" 13PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc = "external-csl-toolchain"
13PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-initial = "external-csl-toolchain" 14PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-initial = "external-csl-toolchain"
14PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-intermediate = "external-csl-toolchain" 15PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-intermediate = "external-csl-toolchain"
16PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-g++ = "external-csl-toolchain"
15PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-binutils = "external-csl-toolchain" 17PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-binutils = "external-csl-toolchain"
16PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "external-csl-toolchain" 18PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "external-csl-toolchain"
19PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-compilerlibs = "external-csl-toolchain"
20PREFERRED_PROVIDER_libgcc = "external-csl-toolchain"
17PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain" 21PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain"
18PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain" 22PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain"
19PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain" 23PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain"
20PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain" 24PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain"
21PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain" 25PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain"
22 26
27
23PREFERRED_VERSION_external-csl-toolchain = "2008q3-72" 28PREFERRED_VERSION_external-csl-toolchain = "2008q3-72"
24 29
25TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include " 30TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
index a874c8b15a..b5a3607657 100644
--- a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
@@ -1,7 +1,12 @@
1inherit libc-common
2inherit libc-package
3
1INHIBIT_DEFAULT_DEPS = "1" 4INHIBIT_DEFAULT_DEPS = "1"
2 5
3# License applies to this recipe code, not the toolchain itself 6# License applies to this recipe code, not the toolchain itself
4LICENSE = "MIT" 7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5 10
6PROVIDES = "\ 11PROVIDES = "\
7 linux-libc-headers \ 12 linux-libc-headers \
@@ -11,21 +16,22 @@ PROVIDES = "\
11 virtual/arm-none-linux-gnueabi-gcc-intermediate \ 16 virtual/arm-none-linux-gnueabi-gcc-intermediate \
12 virtual/arm-none-linux-gnueabi-binutils \ 17 virtual/arm-none-linux-gnueabi-binutils \
13 virtual/arm-none-linux-gnueabi-libc-for-gcc \ 18 virtual/arm-none-linux-gnueabi-libc-for-gcc \
19 virtual/arm-none-linux-gnueabi-compilerlibs \
14 virtual/libc \ 20 virtual/libc \
15 virtual/libintl \ 21 virtual/libintl \
16 virtual/libiconv \ 22 virtual/libiconv \
17 glibc-thread-db \ 23 glibc-thread-db \
24 libgcc \
18 virtual/linux-libc-headers " 25 virtual/linux-libc-headers "
19RPROVIDES = "glibc-utils libsegfault glibc-thread-db" 26RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
20PACKAGES_DYNAMIC = "glibc-gconv-*" 27PACKAGES_DYNAMIC = "glibc-gconv-*"
21PR = "r1" 28PR = "r2"
22 29
23#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2" 30#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
24 31
25SRC_URI = "file://SUPPORTED" 32SRC_URI = "file://SUPPORTED"
26 33
27do_install() { 34do_install() {
28 echo "EXTERNAL_TOOLCHAIN is ${EXTERNAL_TOOLCHAIN}"
29 install -d ${D}${sysconfdir} ${D}${bindir} ${D}${sbindir} ${D}${base_bindir} ${D}${libdir} 35 install -d ${D}${sysconfdir} ${D}${bindir} ${D}${sbindir} ${D}${base_bindir} ${D}${libdir}
30 install -d ${D}${base_libdir} ${D}${base_sbindir} ${D}${datadir} 36 install -d ${D}${base_libdir} ${D}${base_sbindir} ${D}${datadir}
31 37
@@ -40,10 +46,7 @@ do_install() {
40 46
41GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile" 47GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile"
42 48
43inherit libc-common 49PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers linux-libc-headers-dev"
44inherit libc-package
45
46PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers"
47FILES_libgcc = "${base_libdir}/libgcc_s.so.1" 50FILES_libgcc = "${base_libdir}/libgcc_s.so.1"
48FILES_libgcc-dev = "${base_libdir}/libgcc_s.so" 51FILES_libgcc-dev = "${base_libdir}/libgcc_s.so"
49FILES_libstdc++ = "${libdir}/libstdc++.so.*" 52FILES_libstdc++ = "${libdir}/libstdc++.so.*"
@@ -61,4 +64,3 @@ FILES_linux-libc-headers = "${includedir}/asm* \
61 ${includedir}/sound \ 64 ${includedir}/sound \
62 ${includedir}/video \ 65 ${includedir}/video \
63" 66"
64