sanity.bbclass: ensure 32it libc is correctly detected

Fix to work for both Ubuntu and Fedora multilib paths.

Fixes [BUGID #454]

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index f963f280e0449afb181e1fc67bacaf9e6fa6f6d4..7f1f8000df21bf07e28f8d526359edd77c1330d0 100644 (file)
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -156,7 +156,11 @@ def check_sanity(e):
 
        nolibs = data.getVar('NO32LIBS', e.data, True)
        if not nolibs:
-               if os.path.exists('/lib/libc.so.6') and not os.path.exists('/usr/include/gnu/stubs-32.h'):
+               lib32path = '/lib'
+               if os.path.exists('/lib64') and os.path.islink('/lib64'):
+                  lib32path = '/lib32'
+
+               if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
                        messages = messages + "You have a 32-bit libc, but no 32-bit headers.  You must install the 32-bit libc headers.\n"
 
        #