Changeset 20579 in vbox for trunk/src/libs

Timestamp:

Jun 15, 2009 9:16:22 AM (16 years ago)

Author:

vboxsync

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

48588

Message:

Python: attempt to allow .run installer work with multiple Python versions on Linux, cleanup

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (4 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1336 +1336 @@
 ifeq ($(KBUILD_TARGET),win)
  VBoxXPCOMIPCD_SOURCES += \
-        ipc/ipcd/daemon/src/ipcdWin.cpp
+        ipc/ipcd/daemon/src/ipcdWin.cpp
 else
  VBoxXPCOMIPCD_SOURCES += \
-        ipc/ipcd/daemon/src/ipcdUnix.cpp
+        ipc/ipcd/daemon/src/ipcdUnix.cpp
 endif
 
@@ -1364 +1364 @@
    else
     VBOX_PATH_PYTHON_INC := $(patsubst %/Python.h,%, $(lastword $(sort $(wildcard \
-        /usr/include/python2.*/Python.h \
-        /usr/local/include/python2.*/Python.h \
-        ))))
+        /usr/include/python2.*/Python.h \
+        /usr/local/include/python2.*/Python.h \
+        ))))
    endif
    ifeq ($(VBOX_PATH_PYTHON_INC),)
@@ -1376 +1376 @@
    VBOX_TMP := $(if $(eq $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),solaris.amd64),64/,)
    VBOX_LIB_PYTHON := $(firstword $(wildcard \
-        /usr/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
-        /usr/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
-        /usr/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
-        ))
+        /usr/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
+        /usr/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
+        /usr/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
+        ))
    ifeq ($(VBOX_LIB_PYTHON),)
     $(warning Unable to determine the python library (VBOX_LIB_PYTHON).)
@@ -1392 +1392 @@
  endif
  INSTALLS += VBoxPython-inst-py-xpcom
+endif
+
+# Kibd of hack: we don't want to limit VBoxPython.so to single Python version
+# on Linux, where we can avoid putting explicit libpythonX.Y.so dependency
+# to VBoxPython.so
+if "$(KBUILD_TARGET)" == "linux"
+ VBOX_LIB_PYTHON=
 endif