[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, experimental, updated. debian/4.1.18-dfsg-2-30-g1c54801

[Felix Geyer]

The following commit has been merged in the experimental branch:
commit e6e4bc7d5bb9cdc4855d9e25c688ac0827eb2a2b
Author: Felix Geyer <fgeyer at debian.org>
Date:   Wed Mar 6 21:35:22 2013 +0100

    Add 36-python-multiarch.patch from Rico Tzschichholz to fix detection of python in multiarch paths using pkg-config.

diff --git a/debian/changelog b/debian/changelog
index 3aa10bc..2a4f519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ virtualbox (4.2.8-dfsg-1) UNRELEASED; urgency=low
   * Add an init script to virtuabox-guest-x11 which loads the vboxvideo
     kernel module. The X Server 1.13 doesn't load it anymore. (Closes: #686994)
   * Update man pages. (Closes: #680053)
+  * Add 36-python-multiarch.patch from Rico Tzschichholz to fix detection of
+    python in multiarch paths using pkg-config.
 
  -- Felix Geyer <fgeyer at debian.org>  Fri, 25 Jan 2013 18:14:24 +0100
 
diff --git a/debian/patches/36-python-multiarch.patch b/debian/patches/36-python-multiarch.patch
new file mode 100644
index 0000000..8b18b9a
--- /dev/null
+++ b/debian/patches/36-python-multiarch.patch
@@ -0,0 +1,66 @@
+Description: Fix detection of python in multiarch paths using pkg-config.
+Author: Rico Tzschichholz <ricotz at ubuntu.com>
+
+--- a/configure
++++ b/configure
+@@ -1884,32 +1884,32 @@
+   found=
+ # For Solaris we use libpython2.4 for compatibility with Solaris 10 and passing IPS pkg audit
+   if [ "$OS" != "solaris" ]; then
+-    SUPPYTHONLIBS="python2.7 python2.6 python2.5 python2.4 python2.3"
++    SUPPYTHONLIBS="2.7 2.6 2.5 2.4 2.3"
+   else
+-    SUPPYTHONLIBS="python2.4"
++    SUPPYTHONLIBS="2.4"
+   fi
+-  for p in $PYTHONDIR; do
++  PYTHON_CXX_LIBS=""
++  PYTHON_CXX_CFLAGS=""
+     for d in $SUPPYTHONLIBS; do
+-      for b in lib64 lib/64 lib; do
+         echo "compiling the following source file:" >> $LOG
+         cat $ODIR.tmp_src.cc >> $LOG
+         echo "using the following command line:" >> $LOG
+-        echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so" >> $LOG
+-        $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so >> $LOG 2>&1
++        PYTHON_CXX_LIBS=`pkg-config python-$d --libs`
++        PYTHON_CXX_CFLAGS=`pkg-config python-$d --cflags`
++        echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $PYTHON_CXX_CFLAGS $PYTHON_CXX_LIBS" >> $LOG
++        $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $PYTHON_CXX_CFLAGS $PYTHON_CXX_LIBS >> $LOG 2>&1
+         if [ $? -eq 0 ]; then
+           found=1
+           break
+         fi
+-      done
+-      if [ -n "$found" ]; then break; fi
+     done
+-    if [ -n "$found" ]; then break; fi
+-  done
+   if [ -n "$found" ]; then
+     if test_execute; then
+       cnf_append "VBOX_WITH_PYTHON"     "1"
+-      cnf_append "VBOX_PATH_PYTHON_INC" "$p/include/$d"
+-      cnf_append "VBOX_LIB_PYTHON"      "$p/$b/lib$d.so"
++      cnf_append "VBOX_PATH_PYTHON_INC" "$PYTHON_CXX_CFLAGS"
++      cnf_append "VBOX_LIB_PYTHON"      "$PYTHON_CXX_LIBS"
++      cnf_append "VBOX_PYTHON"$d"_INC"  "$PYTHON_CXX_CFLAGS"
++      cnf_append "VBOX_PYTHON"$d"_LIBS" "$PYTHON_CXX_LIBS"
+     else
+       log_failure "Python not working"
+       fail
+--- a/src/libs/xpcom18a4/python/Makefile.kmk
++++ b/src/libs/xpcom18a4/python/Makefile.kmk
+@@ -46,13 +46,6 @@
+   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
+  endif
+ 
+-else
+- # Use the script.
+- $(eval $(subst |,$(NL),$(shell $(VBOX_BLD_PYTHON) \
+-	$(PATH_SUB_CURRENT)/gen_python_deps.py \
+-	    $(KBUILD_TARGET) \
+-	    $(KBUILD_TARGET_ARCH) \
+-	    $(VBOX_MULTIPYTHON) )))
+ endif
+ 
+ ifndef VBOX_ONLY_SDK
diff --git a/debian/patches/series b/debian/patches/series
index 32a41e5..4b67657 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 30-usb-warning-filters.patch
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
+36-python-multiarch.patch

-- 
virtualbox Debian packaging