virtualbox-svn: Try to hack rpath issue

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: virtualbox-svn: Try to hack rpath issue
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Tue, 16 Aug 2016 23:04:48 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Aug 17 01:04:48 2016 +0200
Changeset:	73e435059985fbdb0ca33b745cf18f04a41239e6

Modified Files:
	virtualbox-svn/Makefile
	virtualbox-svn/distinfo
	virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
	virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
Added Files:
	virtualbox-svn/patches/patch-src_VBox_Frontends_VBoxManage_VBoxInternalManage.cpp

Log Message:
virtualbox-svn: Try to hack rpath issue

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

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

diffstat:
 virtualbox-svn/Makefile                            |  4 +-
 virtualbox-svn/distinfo                            |  5 +-
 ...atch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp |  2 +-
 ...Box_Frontends_VBoxManage_VBoxInternalManage.cpp | 72 ++++++++++++++++++++++
 .../patches/patch-src_VBox_Runtime_Makefile.kmk    |  2 +-
 5 files changed, 79 insertions(+), 6 deletions(-)

diffs:
diff --git a/virtualbox-svn/Makefile b/virtualbox-svn/Makefile
index 6e79e46..a082f00 100644
--- a/virtualbox-svn/Makefile
+++ b/virtualbox-svn/Makefile
@@ -86,8 +86,8 @@ CONFIGURE_ARGS+=	--build-headless
 
 pre-configure:
 	${RUN} ${ECHO} "VBOX_GCC_OPT=${CXXFLAGS}" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} ${ECHO} "VBOX_WITH_ORIGIN:=" >> ${WRKSRC}/LocalConfig.kmk
-	${RUN} ${ECHO} "VBOX_WITH_RUNPATH:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
+#	${RUN} ${ECHO} "VBOX_WITH_ORIGIN:=" >> ${WRKSRC}/LocalConfig.kmk
+	${RUN} ${ECHO} "VBOX_WITH_RUNPATH:=${VBLIBDIR}:${PREFIX}/lib" >> ${WRKSRC}/LocalConfig.kmk
 	${RUN} ${ECHO} "VBOX_PATH_APP_PRIVATE_ARCH:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
 	${RUN} ${ECHO} "VBOX_PATH_APP_PRIVATE:=${VBLIBDIR}" >> ${WRKSRC}/LocalConfig.kmk
 	${RUN} ${ECHO} "VBOX_WITH_TESTCASES=" >> ${WRKSRC}/LocalConfig.kmk
diff --git a/virtualbox-svn/distinfo b/virtualbox-svn/distinfo
index bfc0001..cab4c44 100644
--- a/virtualbox-svn/distinfo
+++ b/virtualbox-svn/distinfo
@@ -8,7 +8,7 @@ SHA1 (patch-configure) = 32a205a07cacf12300cd718131153d7a601e48c1
 SHA1 (patch-include_iprt_types.h) = 33af52ca41f7d9555c45cc7dbf5bdc4b33384757
 SHA1 (patch-src_VBox_Additions_x11_Makefile.kmk) = 2afd3794e3df3d97db9743ee3b72159d747197fb
 SHA1 (patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk) = eae2633316f418e172215db90fad2d78cb41dce9
-SHA1 (patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp) = ac41bbf61e9b627fc91852f0039326a212d7580d
+SHA1 (patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp) = 913efc09383afc64cbd4df3592d287e420c30f30
 SHA1 (patch-src_VBox_Devices_Network_lwip-new_src_include_lwip_sockets.h) = 772cf503bd67b4eec97e90f032d0a87f7fb99299
 SHA1 (patch-src_VBox_Devices_Storage_DrvHostBase.cpp) = d0bf9e0f6c5279ae048629d1ecfe8cda3ad6e691
 SHA1 (patch-src_VBox_Devices_Storage_DrvHostBase.h) = 9cdcfb390d3b3ada3e5fa6b3893ca25c475be5d6
@@ -18,6 +18,7 @@ SHA1 (patch-src_VBox_Devices_Storage_DrvVD.cpp) = 18564e44251cbd8af6aca05159467b
 SHA1 (patch-src_VBox_ExtPacks_VBoxDTrace_include_VBoxDTraceLibCWrappers.h) = 5b8d9ab398bfa95bfce84db711c320b856efde7d
 SHA1 (patch-src_VBox_ExtPacks_VBoxDTrace_onnv_lib_libdtrace_common_dt__cc.c) = f96d1af1945812cf1e0f7c4b91b0dd4caecacb72
 SHA1 (patch-src_VBox_ExtPacks_VBoxDTrace_onnv_lib_libdtrace_common_dt__options.c) = a107b46ced20e8964951a115bae4006591fc0843
+SHA1 (patch-src_VBox_Frontends_VBoxManage_VBoxInternalManage.cpp) = 200089d40fb154b9a21c10eede889ac9bf2861fa
 SHA1 (patch-src_VBox_HostDrivers_Support_SUPDrvIDC.h) = df93779d885d4d661f7fbd3d2cfe02517f8ddac6
 SHA1 (patch-src_VBox_HostDrivers_Support_SUPR3HardenedMain.cpp) = 0e086dc3914c2993206cd0f6aa932f4ca5f93f00
 SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_Makefile) = acc98972409405fa7bcb68c61a724752723c22ff
@@ -33,7 +34,7 @@ SHA1 (patch-src_VBox_Main_glue_NativeEventQueue.cpp) = 58ff96858e861b03a495323fd
 SHA1 (patch-src_VBox_Main_include_ConsoleImpl.h) = 2af64e329ca18787d1f9db8746200f6557b951fa
 SHA1 (patch-src_VBox_Main_src-client_ConsoleImpl2.cpp) = 8b7bdd045d0c905c122c497d6b50197a02068c5f
 SHA1 (patch-src_VBox_NetworkServices_NAT_pxping.c) = 47ac337c6e46b0ae4dec3da2e987b94a16e478fc
-SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = a89f5cb31a4b2e08a676d9f1a1b1a772f5f6ca2a
+SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = 4ac40393ebdbfdaa3332465e1d9b1f0a7bb88e1d
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h) = 45e4d9f4a67449099651e96b54b7d108bebe606c
 SHA1 (patch-src_VBox_VMM_testcase_mkdsk.sh) = d949a78be396466636aa2c8d92e6ecf76725f336
 SHA1 (patch-src_libs_xpcom18a4_ipc_ipcd_shared_src_ipcConfig.cpp) = 6ea4110abb786937a69bf0feddcf641d604f7fad
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp b/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
index d9a5032..4b62c58 100644
--- a/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig	2016-08-15 22:22:04.307068286 +0000
+--- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig	2016-08-15 22:22:04.000000000 +0000
 +++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
 @@ -137,6 +137,7 @@ static OSSAUDIOCFG s_OSSConf =
  };
diff --git a/virtualbox-svn/patches/patch-src_VBox_Frontends_VBoxManage_VBoxInternalManage.cpp b/virtualbox-svn/patches/patch-src_VBox_Frontends_VBoxManage_VBoxInternalManage.cpp
new file mode 100644
index 0000000..cf874e3
--- /dev/null
+++ b/virtualbox-svn/patches/patch-src_VBox_Frontends_VBoxManage_VBoxInternalManage.cpp
@@ -0,0 +1,72 @@
+$NetBSD$
+
+--- src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp.orig	2016-08-15 22:22:09.000000000 +0000
++++ src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
+@@ -52,7 +52,7 @@
+ # include <iprt/win/windows.h>
+ # include <winioctl.h>
+ #elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) \
+-    || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
++    || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ # include <errno.h>
+ # include <sys/ioctl.h>
+ # include <sys/types.h>
+@@ -74,9 +74,9 @@
+ # include <sys/dkio.h>
+ # include <sys/vtoc.h>
+ #endif /* RT_OS_SOLARIS */
+-#ifdef RT_OS_FREEBSD
++#if defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ # include <sys/disk.h>
+-#endif /* RT_OS_FREEBSD */
++#endif /* RT_OS_FREEBSD || RT_OS_NETBSD */
+ 
+ using namespace com;
+ 
+@@ -1203,12 +1203,12 @@ static RTEXITCODE CmdCreateRawVMDK(int a
+             i++;
+             pszPartitions = argv[i];
+         }
+-#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_WINDOWS)
++#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_WINDOWS) || defined(RT_OS_NETBSD)
+         else if (strcmp(argv[i], "-relative") == 0)
+         {
+             fRelative = true;
+         }
+-#endif /* RT_OS_LINUX || RT_OS_FREEBSD */
++#endif /* RT_OS_LINUX || RT_OS_FREEBSD || RT_OS_NETBSD */
+         else
+             return errorSyntax(USAGE_CREATERAWVMDK, "Invalid parameter '%s'", argv[i]);
+     }
+@@ -1448,7 +1448,7 @@ static RTEXITCODE CmdCreateRawVMDK(int a
+         RTMsgError("Failed to get file informtation for raw disk '%s': %Rrc",
+                    rawdisk.c_str(), vrc);
+     }
+-#elif defined(RT_OS_FREEBSD)
++#elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+     struct stat DevStat;
+     if (!fstat(RTFileToNative(hRawFile), &DevStat))
+     {
+@@ -1668,7 +1668,7 @@ static RTEXITCODE CmdCreateRawVMDK(int a
+ 
+                 if (fRelative)
+                 {
+-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
++#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+                     /* Refer to the correct partition and use offset 0. */
+                     char *psz;
+ #if defined(RT_OS_LINUX)
+@@ -1690,7 +1690,7 @@ static RTEXITCODE CmdCreateRawVMDK(int a
+                                      "%s%u",
+                                      rawdisk.c_str(),
+                                      partitions.aPartitions[i].uIndex);
+-#elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
++#elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+                     RTStrAPrintf(&psz,
+                                  "%ss%u",
+                                  rawdisk.c_str(),
+@@ -2595,4 +2595,3 @@ RTEXITCODE handleInternalCommands(Handle
+     /* default: */
+     return errorSyntax(USAGE_ALL, "Invalid command '%s'", a->argv[0]);
+ }
+-
diff --git a/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk b/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
index 92710dd..5f80cc0 100644
--- a/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
+++ b/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/VBox/Runtime/Makefile.kmk.orig	2016-08-15 22:22:06.134606983 +0000
+--- src/VBox/Runtime/Makefile.kmk.orig	2016-08-15 22:22:06.000000000 +0000
 +++ src/VBox/Runtime/Makefile.kmk
 @@ -1979,12 +1979,15 @@ RuntimeR0Drv_SDKS.win   = ReorderCompile
  RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL NOFILEID
Prev by Date: munge: Revert to using daemon user and patch Linux init script
Next by Date: virtualbox-svn: Add stub and broken files in r3/netbsd
Previous by Thread: munge: Revert to using daemon user and patch Linux init script
Next by Thread: virtualbox-svn: Add stub and broken files in r3/netbsd
Indexes:
Home | Main Index | Thread Index | Old Index