From 271bd9d8f97ca14e931b45513f6eaa6ed9e9a675 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Wed, 13 Oct 2010 13:24:09 +0100
Subject: 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>
---
meta/classes/sanity.bbclass | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'meta/classes')
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index f963f280e0..7f1f8000df 100644
--- 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"
#
--
cgit v1.2.3-54-g00ecf