From: Christopher Larson <[email protected]>
Signed-off-by: Christopher Larson <[email protected]>
---
...ernal-csl2008q3.inc => tcmode-external-csl.inc} | 21 +++++++----------
...hain_2008q3-72.bb => external-csl-toolchain.bb} | 24 ++++++++++----------
2 files changed, 21 insertions(+), 24 deletions(-)
rename meta/conf/distro/include/{tcmode-external-csl2008q3.inc =>
tcmode-external-csl.inc} (51%)
rename meta/recipes-core/meta/{external-csl-toolchain_2008q3-72.bb =>
external-csl-toolchain.bb} (67%)
diff --git a/meta/conf/distro/include/tcmode-external-csl2008q3.inc
b/meta/conf/distro/include/tcmode-external-csl.inc
similarity index 51%
rename from meta/conf/distro/include/tcmode-external-csl2008q3.inc
rename to meta/conf/distro/include/tcmode-external-csl.inc
index 31055dc..0af3a45 100644
--- a/meta/conf/distro/include/tcmode-external-csl2008q3.inc
+++ b/meta/conf/distro/include/tcmode-external-csl.inc
@@ -1,22 +1,22 @@
#
-# Configuration to use external CSL 2008q3-72 toolchain (ARM EABI)
+# Configuration to use external CSL toolchain
#
TARGET_VENDOR = "-none"
-EXTERNAL_TOOLCHAIN ?= "/usr/local/csl/arm-2008q3"
+EXTERNAL_TOOLCHAIN ?= "/usr/local/csl/${TARGET_ARCH}"
PATH =. "${EXTERNAL_TOOLCHAIN}/bin:"
PREFERRED_PROVIDER_linux-libc-headers = "external-csl-toolchain"
PREFERRED_PROVIDER_linux-libc-headers-dev = "external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc =
"external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-initial =
"external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-gcc-intermediate =
"external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-g++ =
"external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-binutils =
"external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc =
"external-csl-toolchain"
-PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-compilerlibs =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc =
"external-csl-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs =
"external-csl-toolchain"
PREFERRED_PROVIDER_libgcc = "external-csl-toolchain"
PREFERRED_PROVIDER_virtual/libc = "external-csl-toolchain"
PREFERRED_PROVIDER_virtual/libintl = "external-csl-toolchain"
@@ -24,9 +24,6 @@ PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain"
PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain"
PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain"
-
-PREFERRED_VERSION_external-csl-toolchain = "2008q3-72"
-
TARGET_CPPFLAGS_prepend = "
-isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib
-Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
b/meta/recipes-core/meta/external-csl-toolchain.bb
similarity index 67%
rename from meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
rename to meta/recipes-core/meta/external-csl-toolchain.bb
index b5a3607..f1e5332 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
PROVIDES = "\
linux-libc-headers \
- virtual/arm-none-linux-gnueabi-gcc \
- virtual/arm-none-linux-gnueabi-g++ \
- virtual/arm-none-linux-gnueabi-gcc-initial \
- virtual/arm-none-linux-gnueabi-gcc-intermediate \
- virtual/arm-none-linux-gnueabi-binutils \
- virtual/arm-none-linux-gnueabi-libc-for-gcc \
- virtual/arm-none-linux-gnueabi-compilerlibs \
+ virtual/${TARGET_PREFIX}gcc \
+ virtual/${TARGET_PREFIX}g++ \
+ virtual/${TARGET_PREFIX}gcc-initial \
+ virtual/${TARGET_PREFIX}gcc-intermediate \
+ virtual/${TARGET_PREFIX}binutils \
+ virtual/${TARGET_PREFIX}libc-for-gcc \
+ virtual/${TARGET_PREFIX}compilerlibs \
virtual/libc \
virtual/libintl \
virtual/libiconv \
@@ -27,7 +27,7 @@ RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
PACKAGES_DYNAMIC = "glibc-gconv-*"
PR = "r2"
-#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";
+#SRC_URI =
"http://www.codesourcery.com/public/gnu_toolchain/${TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2";
SRC_URI = "file://SUPPORTED"
@@ -35,10 +35,10 @@ do_install() {
install -d ${D}${sysconfdir} ${D}${bindir} ${D}${sbindir}
${D}${base_bindir} ${D}${libdir}
install -d ${D}${base_libdir} ${D}${base_sbindir} ${D}${datadir}
- cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/*
${D}${base_libdir}
- cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/etc/*
${D}${sysconfdir}
- cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/sbin/*
${D}${base_sbindir}
- cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/* ${D}/usr
+ cp -a ${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/libc/lib/* ${D}${base_libdir}
+ cp -a ${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/libc/etc/* ${D}${sysconfdir}
+ cp -a ${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/libc/sbin/*
${D}${base_sbindir}
+ cp -a ${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/libc/usr/* ${D}/usr
sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g"
${D}${libdir}/libc.so
sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g"
${D}${libdir}/libpthread.so
--
1.7.8.rc4
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
