Changeset 45204 in vbox for trunk/src

Timestamp:

Mar 27, 2013 11:19:00 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84562

Message:

Linux hosts: added support for Ubuntu 13.04

Location:

trunk/src

Files:

• VBox/Installer/linux/distributions_deb (modified) (1 diff)
• libs/xpcom18a4/python/gen_python_deps.py (modified) (1 diff)

trunk/src/VBox/Installer/linux/distributions_deb

@@ -5 +5 @@
 _Debian_etch     = DEBIAN_4_0
 _Debian_sarge    = DEBIAN_3_1
+_Ubuntu_raring   = UBUNTU_13_04
 _Ubuntu_quantal  = UBUNTU_12_10
 _Ubuntu_precise  = UBUNTU_12_04

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

@@ -24 +24 @@
         return None
 
-    lib = os.path.join(p, "lib", dllpre+"python"+v+dllsuff)
+    lib = os.path.join(p, "lib/i386-linux-gnu", dllpre+"python"+v+dllsuff)
+    if not os.path.isfile(lib):
+        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
+        lib64 = os.path.join(p, "lib/x86_64-linux-gnu", dllpre+"python"+v+dllsuff)
+        if not os.path.isfile(lib64):
+            lib64 = os.path.join(p, "lib64", dllpre+"python"+v+dllsuff)
+            if not os.path.isfile(lib64):
+                lib64 = lib
     else:
         lib64 = None