virtualbox-svn: Try to make Python handling functional

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Aug 7 04:05:35 2016 +0200
Changeset:	5e10b339befe69acdbeab2d7ed9324521d54e7e6

Modified Files:
	virtualbox-svn/Makefile
	virtualbox-svn/distinfo
	virtualbox-svn/patches/patch-configure

Log Message:
virtualbox-svn: Try to make Python handling functional

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5e10b339befe69acdbeab2d7ed9324521d54e7e6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox-svn/Makefile                |  8 +-------
 virtualbox-svn/distinfo                |  2 +-
 virtualbox-svn/patches/patch-configure | 29 ++++++++++++++++++++++++++++-
 3 files changed, 30 insertions(+), 9 deletions(-)

diffs:
diff --git a/virtualbox-svn/Makefile b/virtualbox-svn/Makefile
index 392037f..aa94b54 100644
--- a/virtualbox-svn/Makefile
+++ b/virtualbox-svn/Makefile
@@ -38,7 +38,6 @@ BUILD_DEPENDS+=	makeself-[0-9]*:../../archivers/makeself
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Adjust paths for pkgsrc
 SUBST_STAGE.paths=	pre-configure
-#SUBST_STAGE.paths=	post-build
 SUBST_FILES.paths+=	configure
 .if ${OPSYS} == "Linux"
 .include "../../sysutils/lvm2/buildlink3.mk"
@@ -48,12 +47,6 @@ SUBST_SED.paths+=	-e 's!^LIBDEVMAPPER=.*!LIBDEVMAPPER="${COMPILER_RPATH_FLAG}${B
 SUBST_SED.paths+=	-e 's!^INCCAP=.*!INCCAP="-I${BUILDLINK_PREFIX.libcap}/include"!g'
 SUBST_SED.paths+=	-e 's!^LIBCAP=.*!LIBCAP="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libcap}/lib -L${BUILDLINK_PREFIX.libcap}/lib -lcap"!g'
 .endif
-# These paths are used as a shell enumeration to check
-#SUBST_SED.paths+=	-e 's!^PYTHONDIR=.*!PYTHONDIR="${PREFIX}"!g'
-# Set proper path of Python libs under ${PREFIX}/lib..
-#SUBST_SED.paths+=	-e 's!lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib!lib!g'
-# Add needed rpath for testing execution of an application linked with libpython
-#SUBST_SED.paths+=	-e 's!PYTHONLIBRPATH=.*!PYTHONLIBRPATH="${COMPILER_RPATH_FLAG}${PREFIX}/lib"!g'
 
 VBLIBDIR=	${PREFIX}/lib/virtualbox
 
@@ -80,6 +73,7 @@ CONFIGURE_ARGS+=	--with-vpx-incset="-I${BUILDLINK_PREFIX.libvpx}/include"
 CONFIGURE_ARGS+=	--with-vpx-libset="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libvpx}/lib -L${BUILDLINK_PREFIX.libvpx}/lib"
 CONFIGURE_ARGS+=	--with-iasl=${PREFIX}/bin/iasl
 CONFIGURE_ARGS+=	--with-python-dirset=${PREFIX}
+CONFIGURE_ARGS+=	--with-python-linkextraset=${COMPILER_RPATH_FLAG}${PREFIX}/lib
 .if ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=	--with-makeself=${PREFIX}/bin/makeself
 .endif
diff --git a/virtualbox-svn/distinfo b/virtualbox-svn/distinfo
index 0c60ee4..20f4f4b 100644
--- a/virtualbox-svn/distinfo
+++ b/virtualbox-svn/distinfo
@@ -4,7 +4,7 @@ SHA1 (VirtualBox-5.0.16.tar.bz2) = ca7b3fadda37b1b281f78ef2d573aceacab7d9fd
 RMD160 (VirtualBox-5.0.16.tar.bz2) = 6d7a5d6cae5367d26a015895c09294ff0282d062
 SHA512 (VirtualBox-5.0.16.tar.bz2) = 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074
 Size (VirtualBox-5.0.16.tar.bz2) = 111062984 bytes
-SHA1 (patch-configure) = a066e73aa956c84cb808f188a5369878f4177fc9
+SHA1 (patch-configure) = 1ab4f1f7887e72c2a8ef7b190d9376a0753f9919
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_postflight) = d073de54d5de4f61e154003e8e2acc039b6e059b
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_preflight) = f24f7d6dd449e6ad664b8e5a8f5861dd7e0f13e8
 SHA1 (patch-src_VBox_VMM_testcase_mkdsk.sh) = d949a78be396466636aa2c8d92e6ecf76725f336
diff --git a/virtualbox-svn/patches/patch-configure b/virtualbox-svn/patches/patch-configure
index 794e745..492a74c 100644
--- a/virtualbox-svn/patches/patch-configure
+++ b/virtualbox-svn/patches/patch-configure
@@ -2,7 +2,26 @@ $NetBSD$
 
 --- configure.orig	2016-08-05 16:04:02.000000000 +0000
 +++ configure
-@@ -2605,6 +2605,62 @@ for option in "$@"; do
+@@ -154,6 +154,7 @@ INCVPX=""
+ LIBVPX="-lvpx"
+ PKGCONFIG="`which_wrapper pkg-config`"
+ PYTHONDIR="/usr /usr/local"
++PYTHONLINKEXTRA=""
+ QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr /usr/local"
+ QT4DIR_PKGCONFIG=1
+ QT5DIR="/usr/lib/qt5 /usr/share/qt5 /usr/lib64/qt5 /usr /usr/local"
+@@ -2126,8 +2127,8 @@ EOF
+         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
++        echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so" $PYTHONLINKEXTRA >> $LOG
++        $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so $PYTHONLINKEXTRA >> $LOG 2>&1
+         if [ $? -eq 0 ]; then
+           found=1
+           break
+@@ -2605,6 +2606,70 @@ for option in "$@"; do
        INCCRYPTO="-I${OPENSSLDIR}/include"
        LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a"
        ;;
@@ -62,6 +81,14 @@ $NetBSD$
 +      VPXLIBSET=`echo $option | cut -d'=' -f2`
 +      LIBVPX="${VPXLIBSET}"
 +      ;;
++    --with-python-dirset=*)
++      PYTHONDIRSET=`echo $option | cut -d'=' -f2`
++      PYTHONDIR="${PYTHONDIRSET}"
++      ;;
++    --with-python-linkextraset=*)
++      PYTHONLINKEXTRASET=`echo $option | cut -d'=' -f2`
++      PYTHONLINKEXTRA="${PYTHONLINKEXTRA}"
++      ;;
      --with-ow-dir=*)
        WATCOM=`echo $option | cut -d'=' -f2`
        ;;