diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-02-19 00:40:49 -0800 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2015-02-19 16:38:10 +0800 |
commit | 06d745a56f39d3d416802098717d182439598d14 (patch) | |
tree | 089e2566a4a8a0ce93b578508fa088524f2f7297 /meta-linaro-toolchain | |
parent | bacd83c0024cc622dde06877b8d0a6ee79e0d804 (diff) |
glibc,external-linaro-toolchain: Now we need to skip them for musl too
musl is alternative to C libraries available for OE now so we can not
assume !uclibc = glibc
Additionally, package libraries coming from gcc 4.9
Change-Id: Ifc86f4aa435c75bd8f95172a7165a8fee9f04647
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-linaro-toolchain')
-rw-r--r-- | meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb | 3 | ||||
-rw-r--r-- | meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb | 32 |
2 files changed, 33 insertions, 2 deletions
diff --git a/meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb b/meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb index 329224b..cf41fb9 100644 --- a/meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb +++ b/meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb @@ -107,8 +107,7 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRN python __anonymous () { import re - uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) - if uc_os: + if d.getVar("TCLIBC", True) != "glibc": raise bb.parse.SkipPackage("incompatible with target %s" % d.getVar('TARGET_OS', True)) } diff --git a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index a0e4752..fc4e30e 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -141,7 +141,13 @@ PACKAGES =+ "\ libubsan \ libubsan-dev \ libubsan-staticdev \ + liblsan \ + liblsan-dev \ + liblsan-staticdev \ linux-libc-headers-dev \ + libtsan \ + libtsan-dev \ + libtsan-staticdev \ libssp \ libssp-dev \ libssp-staticdev \ @@ -219,6 +225,12 @@ PKGV_libasan-staticdev = "${ELT_VER_GCC}" PKGV_libubsan = "${ELT_VER_GCC}" PKGV_libubsan-dev = "${ELT_VER_GCC}" PKGV_libubsan-staticdev = "${ELT_VER_GCC}" +PKGV_liblsan = "${ELT_VER_GCC}" +PKGV_liblsan-dev = "${ELT_VER_GCC}" +PKGV_liblsan-staticdev = "${ELT_VER_GCC}" +PKGV_libtsan = "${ELT_VER_GCC}" +PKGV_libtsan-dev = "${ELT_VER_GCC}" +PKGV_libtsan-staticdev = "${ELT_VER_GCC}" PKGV_linux-libc-headers = "${ELT_VER_KERNEL}" PKGV_linux-libc-headers-dev = "${ELT_VER_KERNEL}" PKGV_gdbserver = "${ELT_VER_GDBSERVER}" @@ -254,6 +266,20 @@ FILES_libubsan-dev = "\ " FILES_libubsan-staticdev = "${base_libdir}/libubsan.a" +FILES_liblsan = "${base_libdir}/liblsan.so.*" +FILES_liblsan-dev = "\ + ${base_libdir}/liblsan.so \ + ${base_libdir}/liblsan.la \ +" +FILES_libtsan-staticdev = "${base_libdir}/libtsan.a" + +FILES_libtsan = "${base_libdir}/libtsan.so.*" +FILES_libtsan-dev = "\ + ${base_libdir}/libtsan.so \ + ${base_libdir}/libtsan.la \ +" +FILES_libtsan-staticdev = "${base_libdir}/libtsan.a" + FILES_libgcc = "${base_libdir}/libgcc_s.so.1" FILES_libgcc-dev = "${base_libdir}/libgcc_s.so" FILES_libstdc++ = "${base_libdir}/libstdc++.so.*" @@ -383,3 +409,9 @@ ELT_VER_MAIN ??= "" python () { if not d.getVar("ELT_VER_MAIN"): raise bb.parse.SkipPackage("External Linaro toolchain not configured (ELT_VER_MAIN not set).") + import re + if d.getVar("TCLIBC", True) != "glibc": + raise bb.parse.SkipPackage("incompatible with target %s" % + d.getVar('TARGET_OS', True)) +} + |