[oe-commits] Khem Raj : glibc_2.21.bb: Fix condition to skip parsing the recipe for non-glibc libc

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 6feef44751d98c55a2764d70c26d170f90b73f9d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6feef44751d98c55a2764d70c26d170f90b73f9d

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Feb 27 17:19:55 2015 +0000

glibc_2.21.bb: Fix condition to skip parsing the recipe for non-glibc libc

The condition should be uclibc 'or' musl then we know its not glibc
right now it checks with 'and' operator, that condition will never be
true

Change-Id: Ifc48e81fd0b3c18d8e1ef76a18c216dc6acda092
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-core/glibc/glibc_2.21.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
index 6e54046..693d937 100644
--- a/meta/recipes-core/glibc/glibc_2.21.bb
+++ b/meta/recipes-core/glibc/glibc_2.21.bb
@@ -67,7 +67,7 @@ GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn
 #
 python __anonymous () {
     import re
-    notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) and (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None)
+    notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) or (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None)
     if notglibc:
         raise bb.parse.SkipPackage("incompatible with target %s" %
                                    d.getVar('TARGET_OS', True))