Changeset 21254 in vbox

Timestamp:

Jul 6, 2009 2:30:09 PM (16 years ago)

Author:

vboxsync

Message:

Python: search lib64 too

File:

• trunk/src/libs/xpcom18a4/python/gen_python_deps.py (modified) (4 diffs)

trunk/src/libs/xpcom18a4/python/gen_python_deps.py

@@ -23 +23 @@
 known = {}
 
-def checkPair(p, v,dllpre,dllsuff, do_bitness_magic):
+def checkPair(p, v,dllpre,dllsuff, bitness_magic):
     file =  os.path.join(p, "include", "python"+v, "Python.h")
     if not os.path.isfile(file):
         return None
-    if do_bitness_magic:
+
+    lib = os.path.join(p, "lib", dllpre+"python"+v+dllsuff)
+
+    if bitness_magic == 1:
         lib64 = os.path.join(p, "lib", "64", dllpre+"python"+v+dllsuff)
+    elif bitness_magic == 2:
+        lib64 = os.path.join(p, "lib64", dllpre+"python"+v+dllsuff)
+        if not os.path.isfile(lib64):
+            lib64 = lib
     else:
         lib64 = None
     return [os.path.join(p, "include", "python"+v), 
-            os.path.join(p, "lib", dllpre+"python"+v+dllsuff),
+            lib,
             lib64]
 
-def print_vars(vers, known, sep, do_bitness_magic):
+def print_vars(vers, known, sep, bitness_magic):
     print "VBOX_PYTHON%s_INC=%s%s" %(vers, known[0], sep)
-    if do_bitness_magic:
+    if bitness_magic > 0:
        print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[2], sep)
     else:
@@ -46 +53 @@
     dllpre = "lib"
     dllsuff = ".so"
-    do_bitness_magic = 0
+    bitness_magic = 0
 
     if len(argv) > 1:
@@ -67 +74 @@
 
     if target == 'solaris' and arch == 'amd64':
-        do_bitness_magic = 1
-    
+        bitness_magic = 1
+
+    if target == 'linux' and arch == 'amd64':
+        bitness_magic = 2
+
     for v in versions:
         for p in prefixes:
-            c = checkPair(p, v, dllpre, dllsuff, do_bitness_magic)
+            c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
             if c is not None:
                 known[v] = c
@@ -85 +95 @@
             d = k
         vers = k.replace('.', '')
-        print_vars(vers, known[k], sep, do_bitness_magic)
+        print_vars(vers, known[k], sep, bitness_magic)
     if d is not None:
-        print_vars("DEF", known[d], sep, do_bitness_magic) 
+        print_vars("DEF", known[d], sep, bitness_magic) 
 
 if __name__ == '__main__':