summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-01-27 11:13:47 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-03 16:17:16 +0000
commit79e48d853b540cc2626b957f98f67fc72d98a917 (patch)
treecfc11c0cecdfd4679f3f5d6e1115f3422dca96b5
parentcbe0a0dd8a4cfde73d2192fbc77e637e3ac4271c (diff)
downloadpoky-79e48d853b540cc2626b957f98f67fc72d98a917.tar.gz
external-csl-toolchain: leverage eglibc's packaging for more granular output
(From OE-Core rev: 414a81a6f3e7caee4107889230a5e648f2791f75) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/external-csl-toolchain.bb43
1 files changed, 35 insertions, 8 deletions
diff --git a/meta/recipes-core/meta/external-csl-toolchain.bb b/meta/recipes-core/meta/external-csl-toolchain.bb
index a866e3e3dd..8cf73dad99 100644
--- a/meta/recipes-core/meta/external-csl-toolchain.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain.bb
@@ -1,5 +1,4 @@
1inherit libc-common 1require recipes-core/eglibc/eglibc-package.inc
2inherit libc-package
3 2
4INHIBIT_DEFAULT_DEPS = "1" 3INHIBIT_DEFAULT_DEPS = "1"
5 4
@@ -8,7 +7,7 @@ LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10 9
11PROVIDES = "\ 10PROVIDES += "\
12 linux-libc-headers \ 11 linux-libc-headers \
13 virtual/${TARGET_PREFIX}gcc \ 12 virtual/${TARGET_PREFIX}gcc \
14 virtual/${TARGET_PREFIX}g++ \ 13 virtual/${TARGET_PREFIX}g++ \
@@ -22,9 +21,8 @@ PROVIDES = "\
22 virtual/libiconv \ 21 virtual/libiconv \
23 glibc-thread-db \ 22 glibc-thread-db \
24 libgcc \ 23 libgcc \
25 virtual/linux-libc-headers " 24 virtual/linux-libc-headers \
26RPROVIDES = "glibc-utils libsegfault glibc-thread-db" 25"
27PACKAGES_DYNAMIC = "glibc-gconv-*"
28PR = "r3" 26PR = "r3"
29 27
30#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${CSL_TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2" 28#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${CSL_TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2"
@@ -50,10 +48,25 @@ do_install() {
50 cp -a ${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}/libc/usr/. ${D}/usr/ 48 cp -a ${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}/libc/usr/. ${D}/usr/
51 fi 49 fi
52 50
51 if [ -e ${D}${prefix}/info ]; then
52 mv ${D}${prefix}/info ${D}${infodir}
53 fi
54 if [ -e ${D}${prefix}/man ]; then
55 mv ${D}${prefix}/man ${D}${mandir}
56 fi
57
58 rm ${D}${sysconfdir}/rpc
59 rm -r ${D}${datadir}/zoneinfo
60 rm -r ${D}${libdir}/bin
61
53 sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so 62 sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
54 sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so 63 sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so
55} 64}
56 65
66do_install_locale_append () {
67 rm -r ${D}${datadir}/locale ${D}${libdir}/locale
68}
69
57SYSROOT_PREPROCESS_FUNCS += "external_toolchain_sysroot_adjust" 70SYSROOT_PREPROCESS_FUNCS += "external_toolchain_sysroot_adjust"
58external_toolchain_sysroot_adjust() { 71external_toolchain_sysroot_adjust() {
59 if [ -n "${CSL_TARGET_CORE}" ]; then 72 if [ -n "${CSL_TARGET_CORE}" ]; then
@@ -67,9 +80,23 @@ external_toolchain_sysroot_adjust() {
67 fi 80 fi
68} 81}
69 82
70GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile" 83PACKAGES =+ "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers linux-libc-headers-dev"
84
85INSANE_SKIP_libgcc = "1"
86INSANE_SKIP_libstdc++ = "1"
87INSANE_SKIP_gdbserver = "1"
88
89PKG_${PN} = "eglibc"
90PKG_${PN}-dev = "eglibc-dev"
91PKG_${PN}-doc = "eglibc-doc"
92PKG_${PN}-dbg = "eglibc-dbg"
93PKG_${PN}-pic = "eglibc-pic"
94PKG_${PN}-utils = "eglibc-utils"
95PKG_${PN}-gconv = "eglibc-gconv"
96PKG_${PN}-extra-nss = "eglibc-extra-nss"
97PKG_${PN}-thread-db = "eglibc-thread-db"
98PKG_${PN}-pcprofile = "eglibc-pcprofile"
71 99
72PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers linux-libc-headers-dev"
73FILES_libgcc = "${base_libdir}/libgcc_s.so.1" 100FILES_libgcc = "${base_libdir}/libgcc_s.so.1"
74FILES_libgcc-dev = "${base_libdir}/libgcc_s.so" 101FILES_libgcc-dev = "${base_libdir}/libgcc_s.so"
75FILES_libstdc++ = "${libdir}/libstdc++.so.*" 102FILES_libstdc++ = "${libdir}/libstdc++.so.*"