sanity.bbclass: some multilib systems have symlink /lib -> /lib64

PATCH Applied Martin Jansa 3 participants 3 messages Mar 3, 2011 – Mar 8, 2011

lore

Share & tools

lore

Martin Jansa

author

2011-03-03 09:40 UTC #0 lore raw

PATCH 1/1 sanity.bbclass: some multilib systems have symlink /lib -> /lib64

* ie gentoo has /lib -> /lib64
* old test assumed only /lib64 -> /lib

Signed-off-by Martin Jansa <[email protected]>

---
 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/classes/sanity.bbclass +1 -1

index 13940f8..433313b 100644
@@ -211,7 +211,7 @@ def check_sanity(e):
     nolibs = data.getVar('NO32LIBS', e.data, True)
     if not nolibs:
         lib32path = '/lib'
-        if os.path.exists('/lib64') and os.path.islink('/lib64'):
+        if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
            lib32path = '/lib32'
 
         if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):

Signature · 1 line

1.7.4.1

Koen Kooi

Acked-by on v1 1/1

2011-03-03 09:57 UTC #1 lore raw

Op 3 mrt 2011, om 10:39 heeft Martin Jansa het volgende geschreven:

Quoted 4 lines

* ie gentoo has /lib -> /lib64
* old test assumed only /lib64 -> /lib
Signed-off-by Martin Jansa <[email protected]>

Looks good to me:

Acked-by Koen Kooi <[email protected]>

Quoted 25 lines

---
meta/classes/sanity.bbclass | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)

meta/classes/sanity.bbclass +1 -1

index 13940f8..433313b 100644
@@ -211,7 +211,7 @@ def check_sanity(e):
    nolibs = data.getVar('NO32LIBS', e.data, True)
    if not nolibs:
        lib32path = '/lib'
-        if os.path.exists('/lib64') and os.path.islink('/lib64'):
+        if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
           lib32path = '/lib32'
 
        if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):

Signature · 7 lines

1.7.4.1


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Richard Purdie

Applied

2011-03-08 18:51 UTC #2 lore raw

In reply to Martin Jansa

Quoted 13 lines · Martin Jansa

* ie gentoo has /lib -> /lib64
* old test assumed only /lib64 -> /lib
Signed-off-by Martin Jansa <[email protected]>
---
 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/sanity.bbclass +0 -0
index 13940f8..433313b 100644

meta/classes/sanity.bbclass def check_sanity(e): · line 217

Quoted 8 lines

meta/classes/sanity.bbclass +1 -1

@@ -211,7 +211,7 @@ def check_sanity(e):
     nolibs = data.getVar('NO32LIBS', e.data, True)
     if not nolibs:
         lib32path = '/lib'
-        if os.path.exists('/lib64') and os.path.islink('/lib64'):
+        if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
            lib32path = '/lib32'
 
         if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):

Merged to master, thanks.

Richard