summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-02-20 04:24:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-21 22:05:36 +0000
commitd4f11d6d51870b3aafebae8a2d4e8bc34e30c344 (patch)
tree2233ac15d1ec526cc4f96eb427a5360b7eaa5aa7
parent739b177ad904fe8d4f66c12abf07012b109944e4 (diff)
downloadpoky-d4f11d6d51870b3aafebae8a2d4e8bc34e30c344.tar.gz
glibc: Dont offer to be parsed for non-glibc TCLIBC selection
We now can support musl along with uclibc and glibc earlier when only alternative was uclibc this check was fine but now we need to consider non-glibc vs glibc case instead of uclibc vs glibc Change-Id: Id794ce193c6557b5435002a8f9b6eb608738b696 (From OE-Core rev: 5d7bc14d22da87837741fefae5924571fdff750d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc_2.21.bb12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
index 1ef494b086..6e540462cb 100644
--- a/meta/recipes-core/glibc/glibc_2.21.bb
+++ b/meta/recipes-core/glibc/glibc_2.21.bb
@@ -62,17 +62,13 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
62GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1" 62GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
63 63
64# 64#
65# For now, we will skip building of a gcc package if it is a uclibc one 65# We will skip parsing glibc when system C library selection is not glibc
66# and our build is not a uclibc one, and we skip a glibc one if our build 66# this helps in easing out parsing for non-glibc system libraries
67# is a uclibc build.
68# 67#
69# See the note in gcc/gcc_3.4.0.oe
70#
71
72python __anonymous () { 68python __anonymous () {
73 import re 69 import re
74 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) 70 notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) and (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None)
75 if uc_os: 71 if notglibc:
76 raise bb.parse.SkipPackage("incompatible with target %s" % 72 raise bb.parse.SkipPackage("incompatible with target %s" %
77 d.getVar('TARGET_OS', True)) 73 d.getVar('TARGET_OS', True))
78} 74}