summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-01-27 11:13:44 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-02 16:55:31 +0000
commit7923ba87a220a216292fcb498bf11149189a3cbb (patch)
tree06f0b6399e402ef4548f995e7f3e9a1030539f54
parentae21dc189f78e428a5c02ee90605843eacc1eb94 (diff)
downloadpoky-7923ba87a220a216292fcb498bf11149189a3cbb.tar.gz
external-csl-toolchain: avoid the hardcoded version/prefix
(From OE-Core rev: 4346516a6a719355d2793af289f93e14d3dedd0c) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/tcmode-external-csl.inc (renamed from meta/conf/distro/include/tcmode-external-csl2008q3.inc)21
-rw-r--r--meta/recipes-core/meta/external-csl-toolchain.bb (renamed from meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb)24
2 files changed, 21 insertions, 24 deletions
diff --git a/meta/conf/distro/include/tcmode-external-csl2008q3.inc b/meta/conf/distro/include/tcmode-external-csl.inc
index 31055dcab4..0af3a45127 100644
--- a/meta/conf/distro/include/tcmode-external-csl2008q3.inc
+++ b/meta/conf/distro/include/tcmode-external-csl.inc
@@ -1,22 +1,22 @@
1# 1#
2# Configuration to use external CSL 2008q3-72 toolchain (ARM EABI) 2# Configuration to use external CSL toolchain
3# 3#
4 4
5TARGET_VENDOR = "-none" 5TARGET_VENDOR = "-none"
6 6
7EXTERNAL_TOOLCHAIN ?= "/usr/local/csl/arm-2008q3" 7EXTERNAL_TOOLCHAIN ?= "/usr/local/csl/${TARGET_ARCH}"
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_linux-libc-headers-dev = "external-csl-toolchain"
13PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc = "external-csl-toolchain" 13PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-csl-toolchain"
14PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-initial = "external-csl-toolchain" 14PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-csl-toolchain"
15PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-intermediate = "external-csl-toolchain" 15PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-csl-toolchain"
16PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-g++ = "external-csl-toolchain" 16PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-csl-toolchain"
17PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-binutils = "external-csl-toolchain" 17PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-csl-toolchain"
18PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "external-csl-toolchain" 18PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-csl-toolchain"
19PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-compilerlibs = "external-csl-toolchain" 19PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-csl-toolchain"
20PREFERRED_PROVIDER_libgcc = "external-csl-toolchain" 20PREFERRED_PROVIDER_libgcc = "external-csl-toolchain"
21PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain" 21PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain"
22PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain" 22PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain"
@@ -24,9 +24,6 @@ PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain"
24PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain" 24PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain"
25PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain" 25PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain"
26 26
27
28PREFERRED_VERSION_external-csl-toolchain = "2008q3-72"
29
30TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include " 27TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
31TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib " 28TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
32 29
diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-core/meta/external-csl-toolchain.bb
index b5a3607657..f1e53328b4 100644
--- a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain.bb
@@ -10,13 +10,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
10 10
11PROVIDES = "\ 11PROVIDES = "\
12 linux-libc-headers \ 12 linux-libc-headers \
13 virtual/arm-none-linux-gnueabi-gcc \ 13 virtual/${TARGET_PREFIX}gcc \
14 virtual/arm-none-linux-gnueabi-g++ \ 14 virtual/${TARGET_PREFIX}g++ \
15 virtual/arm-none-linux-gnueabi-gcc-initial \ 15 virtual/${TARGET_PREFIX}gcc-initial \
16 virtual/arm-none-linux-gnueabi-gcc-intermediate \ 16 virtual/${TARGET_PREFIX}gcc-intermediate \
17 virtual/arm-none-linux-gnueabi-binutils \ 17 virtual/${TARGET_PREFIX}binutils \
18 virtual/arm-none-linux-gnueabi-libc-for-gcc \ 18 virtual/${TARGET_PREFIX}libc-for-gcc \
19 virtual/arm-none-linux-gnueabi-compilerlibs \ 19 virtual/${TARGET_PREFIX}compilerlibs \
20 virtual/libc \ 20 virtual/libc \
21 virtual/libintl \ 21 virtual/libintl \
22 virtual/libiconv \ 22 virtual/libiconv \
@@ -27,7 +27,7 @@ RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
27PACKAGES_DYNAMIC = "glibc-gconv-*" 27PACKAGES_DYNAMIC = "glibc-gconv-*"
28PR = "r2" 28PR = "r2"
29 29
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" 30#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2"
31 31
32SRC_URI = "file://SUPPORTED" 32SRC_URI = "file://SUPPORTED"
33 33
@@ -35,10 +35,10 @@ do_install() {
35 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}
36 install -d ${D}${base_libdir} ${D}${base_sbindir} ${D}${datadir} 36 install -d ${D}${base_libdir} ${D}${base_sbindir} ${D}${datadir}
37 37
38 cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/* ${D}${base_libdir} 38 cp -a ${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/libc/lib/* ${D}${base_libdir}
39 cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/etc/* ${D}${sysconfdir} 39 cp -a ${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/libc/etc/* ${D}${sysconfdir}
40 cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/sbin/* ${D}${base_sbindir} 40 cp -a ${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/libc/sbin/* ${D}${base_sbindir}
41 cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/* ${D}/usr 41 cp -a ${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/libc/usr/* ${D}/usr
42 42
43 sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so 43 sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
44 sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so 44 sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so