Start adjusting patches (for NetBSD)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Start adjusting patches (for NetBSD)
From: Makoto Fujiwara <makoto%ki.nu@localhost>
Date: Wed, 23 Sep 2015 06:04:17 +0000
Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Wed Sep 23 15:04:17 2015 +0900
Changeset:	2e88673178cde21c9711d5163dff18751709cca0

Modified Files:
	virtualbox-ose/distinfo
	virtualbox-ose/patches/patch-Config.kmk
Added Files:
	virtualbox-ose/patches/patch-src-VBox-Runtime-r3-posix-thread-posix.cpp

Log Message:
Start adjusting patches (for NetBSD)

 - Add comments on patches
 - Add NetBSD where FreeBSD changes

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

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

diffstat:
 virtualbox-ose/distinfo                            |  3 +-
 virtualbox-ose/patches/patch-Config.kmk            | 32 ++++++++++++----------
 ...atch-src-VBox-Runtime-r3-posix-thread-posix.cpp | 15 ++++++++++
 3 files changed, 34 insertions(+), 16 deletions(-)

diffs:
diff --git a/virtualbox-ose/distinfo b/virtualbox-ose/distinfo
index c4fb7a9..d87b542 100644
--- a/virtualbox-ose/distinfo
+++ b/virtualbox-ose/distinfo
@@ -3,7 +3,7 @@ $NetBSD$
 SHA1 (VirtualBox-4.3.30.tar.bz2) = 16976f2d520af78797f85404e38c3abb6084db09
 RMD160 (VirtualBox-4.3.30.tar.bz2) = bc43b45cc7eeecc2fde922d197cde3a1e6cede14
 Size (VirtualBox-4.3.30.tar.bz2) = 97428942 bytes
-SHA1 (patch-Config.kmk) = 9a3e0e7ccf45aecca2651c60d39eb78da734dead
+SHA1 (patch-Config.kmk) = c857913e482673cf48f47bb02fa0a8ea939e1aa9
 SHA1 (patch-configure) = 949f32c43fdd44dbfdd60312b7a088b2bb25af4a
 SHA1 (patch-include-VBox-com-array.h) = 3df9650bd11f2e21bdcb40d2b68d28121c3e01ea
 SHA1 (patch-include-VBox-vmm-cpumctx.h) = de663f58a60b79ba071457ffb001ff56580aa2ea
@@ -55,6 +55,7 @@ SHA1 (patch-src-VBox-Runtime-common-misc-uri.cpp) = efac47610a942e196b8bb5cadec0
 SHA1 (patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c) = 7622528f6988110cfe2887f9d22a502b2839a556
 SHA1 (patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h) = 46f398e36198533a49799ce23b9c073a7a366861
 SHA1 (patch-src-VBox-Runtime-r3-freebsd-RTSystemQueryTotalRam-freebsd.cpp) = 2b6bc12c6d9a768ed6a3e1206ef032fad468cff2
+SHA1 (patch-src-VBox-Runtime-r3-posix-thread-posix.cpp) = 10697de9e932f07ffb6fcfb7a933b2243efcf3a7
 SHA1 (patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp) = c14f53cbfd5b52c441a901b92375a7a52026cfb6
 SHA1 (patch-src-recompiler-Sun-testmath.c) = 89c5f18ff91b21da7e6096ef27421a05897bd76d
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_postflight) = 7ca0133e7027a96779fa27cb0f525ed72d00e7c2
diff --git a/virtualbox-ose/patches/patch-Config.kmk b/virtualbox-ose/patches/patch-Config.kmk
index 3a94027..6865941 100644
--- a/virtualbox-ose/patches/patch-Config.kmk
+++ b/virtualbox-ose/patches/patch-Config.kmk
@@ -1,26 +1,28 @@
 $NetBSD$
 
+Add FreeBSD and NetBSD
+
 --- Config.kmk.orig	2014-07-16 16:59:27.000000000 -0400
 +++ Config.kmk	2014-07-16 17:12:48.000000000 -0400
-@@ -339,7 +339,7 @@
+@@ -339,7 +339,7 @@ VBOX_WITH_DOCS = 1
  # Include documentation in the package
  VBOX_WITH_DOCS_PACKING = 1
  # Include CHM when building docs (unset in LocalConfig.kmk to suppress CHM)
 -ifn1of ($(KBUILD_TARGET), linux)
-+ifn1of ($(KBUILD_TARGET), freebsd linux)
++ifn1of ($(KBUILD_TARGET), netbsd freebsd linux)
   VBOX_WITH_DOCS_CHM = 1
  endif
  # By default only include translations in documentation-only builds
-@@ -602,7 +602,7 @@
+@@ -608,7 +608,7 @@ VBOX_WITH_VDITOOL =
  # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
  VBOX_WITH_VBOX_IMG =
  # Enables the VPX module for VM video capturing
 -if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
-+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
++if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 netbsd.x86 netbsd.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
   VBOX_WITH_VPX = 1
  endif
  # Enable shared folders
-@@ -891,10 +891,6 @@
+@@ -899,10 +899,6 @@ ifeq ($(KBUILD_TARGET),darwin)
   VBOX_WITH_VBOXSDL=
  endif
  
@@ -31,16 +33,16 @@ $NetBSD$
  ifeq ($(KBUILD_TARGET),haiku)
   # Don't bother with SDL ttf for now.
   VBOX_WITH_SECURELABEL=
-@@ -1050,7 +1046,7 @@
+@@ -1058,7 +1054,7 @@ ifdef VBOX_OSE
   VBOX_WITH_SECURELABEL=
   VBOX_WITH_KCHMVIEWER=
   VBOX_WITH_PLUGIN_CRYPT=
 - ifn1of ($(KBUILD_TARGET), linux)
-+ ifn1of ($(KBUILD_TARGET), freebsd linux)
++ ifn1of ($(KBUILD_TARGET), netbsd freebsd linux)
    VBOX_WITH_DOCS=
    VBOX_WITH_DOCS_PACKING=
   endif
-@@ -3476,16 +3472,16 @@
+@@ -3516,16 +3512,16 @@ TEMPLATE_VBOXR0DRV_CFLAGS              =
  	$(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \
  	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
  	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
@@ -60,7 +62,7 @@ $NetBSD$
  	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
  	-nostdinc
  TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
-@@ -3719,12 +3715,8 @@
+@@ -3760,12 +3756,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS            +=
  TEMPLATE_VBOXR3EXE_TOOL                = GXX3
  TEMPLATE_VBOXR3EXE_LIBS                = pthread
  TEMPLATE_VBOXR3EXE_INCS               += \
@@ -73,16 +75,16 @@ $NetBSD$
  	/usr/local/lib
   else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBOXR3EXE_TOOL                = GXX3PLAIN
-@@ -3982,7 +3974,7 @@
+@@ -4023,7 +4015,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain
   TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86       = $(NOT_SUCH_VARIABLE)
   TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64     = $(NOT_SUCH_VARIABLE)
 -else ifn1of ($(KBUILD_TARGET), os2)
-+else ifn1of ($(KBUILD_TARGET), os2 freebsd)
++else ifn1of ($(KBUILD_TARGET), os2 netbsd freebsd)
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
  endif
-@@ -4370,12 +4362,8 @@
+@@ -4428,12 +4420,8 @@ TEMPLATE_VBOXMAINEXE_LIBS               
  TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
  TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
  TEMPLATE_VBOXMAINEXE_INCS               += \
@@ -95,7 +97,7 @@ $NetBSD$
  	/usr/local/lib
  else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
-@@ -4838,12 +4826,8 @@
+@@ -4897,12 +4885,8 @@ ifdef VBOX_WITH_QTGUI
  	$(VBOX_LIBPATH_X11)
     ifeq ($(KBUILD_TARGET),freebsd)
      TEMPLATE_VBOXQT4GUIEXE_INCS += \
@@ -108,7 +110,7 @@ $NetBSD$
  	/usr/local/lib
     endif
     ifeq ($(KBUILD_TARGET),solaris)
-@@ -5035,12 +5019,8 @@
+@@ -5094,12 +5078,8 @@ TEMPLATE_VBoxBldProg_LIBPATH            
  TEMPLATE_VBoxBldProg_TOOL                = GXX3
  TEMPLATE_VBoxBldProg_LIBS                = pthread
  TEMPLATE_VBoxBldProg_INCS               += \
@@ -121,7 +123,7 @@ $NetBSD$
  	/usr/local/lib
   else ifeq ($(KBUILD_HOST),solaris)
  TEMPLATE_VBoxBldProg_TOOL                = GXX3PLAIN
-@@ -5427,6 +5407,7 @@
+@@ -5461,6 +5441,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darw
  	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
  	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
  TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux    = -Wl,--no-as-needed
diff --git a/virtualbox-ose/patches/patch-src-VBox-Runtime-r3-posix-thread-posix.cpp b/virtualbox-ose/patches/patch-src-VBox-Runtime-r3-posix-thread-posix.cpp
new file mode 100644
index 0000000..c47a576
--- /dev/null
+++ b/virtualbox-ose/patches/patch-src-VBox-Runtime-r3-posix-thread-posix.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add FreeBSD and NetBSD
+
+--- src/VBox/Runtime/r3/posix/thread-posix.cpp~	2015-07-10 23:31:55.000000000 +0900
++++ src/VBox/Runtime/r3/posix/thread-posix.cpp	2015-09-22 21:41:19.000000000 +0900
+@@ -414,7 +414,7 @@ RTR3DECL(int) RTThreadGetExecutionTimeMi
+     *pUserTime   = ts.ru_utime.tv_sec * 1000 + ts.ru_utime.tv_usec / 1000;
+     return VINF_SUCCESS;
+ 
+-#elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
++#elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+     /* on Linux, getrusage(RUSAGE_THREAD, ...) is available since 2.6.26 */
+     struct timespec ts;
+     int rc = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
Home | Main Index | Thread Index | Old Index