summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-28 02:16:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-03 16:38:47 +0100
commit8a5df28e675ae8966f3b819f54fa3be05e03fc81 (patch)
tree2aa1ad25e66c171872cfc134fca471691153598a
parent9dbb2d2bc8a54fb5197496ed1f85191ec1a191e0 (diff)
downloadpoky-8a5df28e675ae8966f3b819f54fa3be05e03fc81.tar.gz
glibc: ignore for musl/uclibc but only for target recipes
we still need nativesdk or native recipes for libc to come from glibc, but only be ignored for target recipes types Change-Id: Ibaf8114f2aef63f1eadf493b264e78cd928535a0 (From OE-Core rev: 66e4a0d10a382618fe925b33a9d6df3ee49297e2) 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-collateral.inc3
-rw-r--r--meta/recipes-core/glibc/glibc_2.21.bb9
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc
index f82db06cb9..60655eba3c 100644
--- a/meta/recipes-core/glibc/glibc-collateral.inc
+++ b/meta/recipes-core/glibc/glibc-collateral.inc
@@ -17,3 +17,6 @@ do_compile[noexec] = "1"
17 17
18do_install[depends] += "virtual/${MLPREFIX}libc:do_populate_sysroot" 18do_install[depends] += "virtual/${MLPREFIX}libc:do_populate_sysroot"
19 19
20COMPATIBLE_HOST_libc-musl_class-target = "null"
21COMPATIBLE_HOST_libc-uclibc_class-target = "null"
22
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
index 81b5a2bdbd..8197c29d2e 100644
--- a/meta/recipes-core/glibc/glibc_2.21.bb
+++ b/meta/recipes-core/glibc/glibc_2.21.bb
@@ -70,14 +70,11 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
70GLIBC_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" 70GLIBC_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"
71 71
72# 72#
73# We will skip parsing glibc when system C library selection is not glibc 73# We will skip parsing glibc when target system C library selection is not glibc
74# this helps in easing out parsing for non-glibc system libraries 74# this helps in easing out parsing for non-glibc system libraries
75# 75#
76python __anonymous () { 76COMPATIBLE_HOST_libc-musl_class-target = "null"
77 if d.getVar('TCLIBC', True) != "glibc": 77COMPATIBLE_HOST_libc-uclibc_class-target = "null"
78 raise bb.parse.SkipPackage("incompatible with %s C library" %
79 d.getVar('TCLIBC', True))
80}
81 78
82EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 79EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
83 --without-cvs --disable-profile \ 80 --without-cvs --disable-profile \