summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-10-13 13:24:09 +0100
committerJoshua Lock <josh@linux.intel.com>2010-10-13 15:31:12 +0100
commit271bd9d8f97ca14e931b45513f6eaa6ed9e9a675 (patch)
treeb53be805946da8462d11d2167f79c1b38bdbe363 /meta
parentd393edda26269f74914d3f86092779a808fdb296 (diff)
downloadpoky-271bd9d8f97ca14e931b45513f6eaa6ed9e9a675.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sanity.bbclass6
1 files changed, 5 insertions, 1 deletions
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):
156 156
157 nolibs = data.getVar('NO32LIBS', e.data, True) 157 nolibs = data.getVar('NO32LIBS', e.data, True)
158 if not nolibs: 158 if not nolibs:
159 if os.path.exists('/lib/libc.so.6') and not os.path.exists('/usr/include/gnu/stubs-32.h'): 159 lib32path = '/lib'
160 if os.path.exists('/lib64') and os.path.islink('/lib64'):
161 lib32path = '/lib32'
162
163 if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
160 messages = messages + "You have a 32-bit libc, but no 32-bit headers. You must install the 32-bit libc headers.\n" 164 messages = messages + "You have a 32-bit libc, but no 32-bit headers. You must install the 32-bit libc headers.\n"
161 165
162 # 166 #