pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

virtualbox-ose: More for NetBSD conversion. ( not really known improvement or not)

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sat Sep 26 01:15:13 2015 +0900
Changeset:	cd9cefa5a31ce23563dc74da6516977119e84e86

Modified Files:
	virtualbox-ose/Makefile
	virtualbox-ose/TODO
	virtualbox-ose/distinfo
	virtualbox-ose/patches/patch-src-VBox-Runtime-Makefile.kmk

Log Message:
virtualbox-ose: More for NetBSD conversion. (not really known improvement or not)

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

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

diffstat:
 virtualbox-ose/Makefile                            |   4 +-
 virtualbox-ose/TODO                                |  23 ++-
 virtualbox-ose/distinfo                            |   3 +-
 .../patches/patch-src-VBox-Runtime-Makefile.kmk    | 197 ++++++++++++++++++++-
 4 files changed, 214 insertions(+), 13 deletions(-)

diffs:
diff --git a/virtualbox-ose/Makefile b/virtualbox-ose/Makefile
index 402ef04..fcccca1 100644
--- a/virtualbox-ose/Makefile
+++ b/virtualbox-ose/Makefile
@@ -22,7 +22,7 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	cdrtools-[0-9]*:../../sysutils/cdrtools
 
 BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
-BUILD_DEPENDS+=	kBuild-[0-9]*:../../wip/kBuild-svn
+BUILD_DEPENDS+=	kBuild>=0.1.999:../../wip/kBuild-svn
 
 USE_TOOLS+=	gtar pkg-config gmake
 
@@ -70,6 +70,8 @@ post-patch:
 	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT4}' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
+	@${MKDIR} ${WRKSRC}/src/VBox/Installer/netbsd
+	@${CP}    ${FILESDIR}/src-VBox-Installer-netbsd-Makefile.kmk ${WRKSRC}/src/VBox/Installer/netbsd/Makefile.kmk
 
 do-build:
 	cd ${WRKSRC}/ && \
diff --git a/virtualbox-ose/TODO b/virtualbox-ose/TODO
index 444a185..e884814 100644
--- a/virtualbox-ose/TODO
+++ b/virtualbox-ose/TODO
@@ -22,10 +22,19 @@ iwrap.kmk: No such file or directory
         7237857 Sep 25 00:19 work/VirtualBox-4.3.30/out/freebsd.amd64/release/bin/VBoxRT.so
    - make ends with:
 
-/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp:101: undefined reference to `RTFileSeek'
-ld: /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scm: hidden symbol `rtThreadNativeDestroy' isn't defined
-ld: final link failed: Bad value
-kmk: *** [/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scm] Error 1
-The failing command:
-@c++                  -m64   -o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scm /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scm.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scmdiff.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scmrw.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scmstream.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scmsubversion.o   -L/usr/local/lib   /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/lib/RuntimeBldProg.a   /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/lib/VBox-kStuffStaticBldProg.a   /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/lib/Runtime
BldProg.a   -lpthread
-*** Error code 2
+/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp:84:51: error: too few arguments to function 'int rtPathFromNative(const char**, const char*, const char*)'
+         int rc = rtPathFromNative(&pszTmp, pszPath);
+                                                   ^
+In file included from /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp:43:0:
+/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/include/internal/path.h:95:5: note: declared here
+ int rtPathFromNative(const char **ppszPath, const char *pszNativePath, const char *pszBasePath);
+     ^
+/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp:89:34: error: too few arguments to function 'void rtPathFreeIprt(const char*, const char*)'
+             rtPathFreeIprt(pszTmp);
+                                  ^
+In file included from /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp:43:0:
+/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/include/internal/path.h:103:6: note: declared here
+ void rtPathFreeIprt(const char *pszPath, const char *pszNativePath);
+      ^
+kmk: *** [/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/RuntimeBldProg/r3/freebsd/rtProcInitExePath-freebsd.o] Error 1
+
diff --git a/virtualbox-ose/distinfo b/virtualbox-ose/distinfo
index cdfd3cb..0d7fa83 100644
--- a/virtualbox-ose/distinfo
+++ b/virtualbox-ose/distinfo
@@ -49,13 +49,14 @@ SHA1 (patch-src-VBox-Main-src-server-MachineImpl.cpp) = bd9ae36daaaf5e269d03b003
 SHA1 (patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp) = f953af7f809d3a0672bb46a2c68ce72647fb8697
 SHA1 (patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp) = f52eb861940fffdc715a3f945721d61bedd8a6e1
 SHA1 (patch-src-VBox-Main-webservice-Makefile.kmk) = 6170994631263fb586015ac3ef9957932addda32
-SHA1 (patch-src-VBox-Runtime-Makefile.kmk) = e6eb99cf13e234fb412c74eb9ba78cdf1b2b861a
+SHA1 (patch-src-VBox-Runtime-Makefile.kmk) = 79149b80f1fb7e97eaaec31b99b4ea8611c86665
 SHA1 (patch-src-VBox-Runtime-common-checksum-manifest3.cpp) = 0848a226baef539ed703ecb4c694fe56e915b32c
 SHA1 (patch-src-VBox-Runtime-common-dbg-dbgmodcodeview.cpp) = 3c85ec921bfad6c654780db4c410f2ce327909dd
 SHA1 (patch-src-VBox-Runtime-common-misc-uri.cpp) = efac47610a942e196b8bb5cadec02b1c62086b3d
 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-freebsd-RTSystemQueryTotalRam-netbsd.cpp) = 036c5140667a51927df0fd2809b5f706e3a92e7b
 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
diff --git a/virtualbox-ose/patches/patch-src-VBox-Runtime-Makefile.kmk b/virtualbox-ose/patches/patch-src-VBox-Runtime-Makefile.kmk
index 5d50482..2eb0ef9 100644
--- a/virtualbox-ose/patches/patch-src-VBox-Runtime-Makefile.kmk
+++ b/virtualbox-ose/patches/patch-src-VBox-Runtime-Makefile.kmk
@@ -1,25 +1,214 @@
 $NetBSD$
 
---- src/VBox/Runtime/Makefile.kmk.orig	2014-07-15 13:25:15.000000000 -0400
-+++ src/VBox/Runtime/Makefile.kmk	2014-07-16 17:15:58.000000000 -0400
-@@ -146,6 +146,11 @@
+--- src/VBox/Runtime/Makefile.kmk.orig	2015-07-10 23:31:43.000000000 +0900
++++ src/VBox/Runtime/Makefile.kmk	2015-09-26 00:51:03.000000000 +0900
+@@ -146,6 +146,12 @@ common/misc/buildconfig.cpp_DEFS = \
  	IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\"
  
  #
 +# Set the defines that utf8-posix.cpp needs. It's used by several targets.
 +#
 +r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS)
++r3/posix/utf8-posix.cpp_DEFS.netbsd = $(VBOX_ICONV_DEFS)
 +
 +#
  # Unicode Specification reader used to regenerate unidata-*.cpp.
  #
  uniread_TEMPLATE = VBoxBldProg
-@@ -1004,7 +1009,7 @@
+@@ -1022,7 +1028,79 @@ RuntimeR3_SOURCES.freebsd = \
  	r3/posix/RTMemProtect-posix.cpp \
  	r3/posix/RTPathUserHome-posix.cpp \
  	r3/posix/RTSystemQueryOSInfo-posix.cpp \
 -	r3/posix/RTSystemQueryTotalRam-posix.cpp \
 +	r3/freebsd/RTSystemQueryTotalRam-freebsd.cpp \
++	r3/posix/RTTimeNow-posix.cpp \
++	r3/posix/RTTimeSet-posix.cpp \
++	r3/posix/dir-posix.cpp \
++	r3/posix/env-posix.cpp \
++	r3/posix/errvars-posix.cpp \
++	r3/posix/fileio-posix.cpp \
++	r3/posix/fileio2-posix.cpp \
++	r3/posix/filelock-posix.cpp \
++	r3/posix/fs-posix.cpp \
++	r3/posix/fs2-posix.cpp \
++	r3/posix/fs3-posix.cpp \
++	r3/posix/ldrNative-posix.cpp \
++	r3/posix/rtmempage-exec-mmap-heap-posix.cpp \
++	r3/posix/rtmemlocked-posix.cpp \
++	r3/posix/path-posix.cpp \
++	r3/posix/path2-posix.cpp \
++	r3/posix/pathhost-posix.cpp \
++	r3/posix/RTPathUserDocuments-posix.cpp \
++	r3/posix/pipe-posix.cpp \
++	r3/posix/process-posix.cpp \
++	r3/posix/process-creation-posix.cpp \
++	r3/posix/rand-posix.cpp \
++	r3/posix/semevent-posix.cpp \
++	r3/posix/semeventmulti-posix.cpp \
++	r3/posix/semmutex-posix.cpp \
++	r3/posix/semrw-posix.cpp \
++	r3/posix/symlink-posix.cpp \
++	r3/posix/thread-posix.cpp \
++	r3/posix/thread2-posix.cpp \
++	r3/posix/time-posix.cpp \
++	r3/posix/timelocal-posix.cpp \
++	r3/posix/timer-posix.cpp \
++	r3/posix/tls-posix.cpp \
++	r3/posix/utf8-posix.cpp
++
++RuntimeR3_SOURCES.netbsd = \
++	generic/cdrom-generic.cpp \
++	generic/RTDirQueryInfo-generic.cpp \
++	generic/RTDirSetTimes-generic.cpp \
++	generic/RTFileMove-generic.cpp \
++	generic/RTLogWriteDebugger-generic.cpp \
++	generic/RTPathAbs-generic.cpp \
++	generic/RTPathGetCurrentOnDrive-generic.cpp \
++	generic/RTSemEventMultiWait-2-ex-generic.cpp \
++	generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
++	generic/RTSystemQueryDmiString-generic.cpp \
++	generic/RTSystemShutdown-generic.cpp \
++	generic/RTThreadGetAffinity-stub-generic.cpp \
++	generic/RTThreadSetAffinity-stub-generic.cpp \
++	generic/RTThreadSetAffinityToCpu-generic.cpp \
++	generic/RTTimeLocalNow-generic.cpp \
++	generic/RTTimerCreate-generic.cpp \
++	generic/RTUuidCreate-generic.cpp \
++	generic/mppresent-generic.cpp \
++	generic/sched-generic.cpp \
++	generic/utf16locale-generic.cpp \
++	generic/uuid-generic.cpp \
++	generic/RTMpCpuId-generic.cpp \
++	generic/RTMpGetCoreCount-generic.cpp \
++	generic/RTMpGetOnlineCoreCount-generic.cpp \
++	generic/RTProcDaemonize-generic.cpp \
++	generic/RTProcIsRunningByName-generic.cpp \
++	generic/RTThreadGetNativeState-generic.cpp \
++	r3/freebsd/mp-freebsd.cpp \
++	r3/freebsd/rtProcInitExePath-freebsd.cpp \
++	r3/generic/allocex-r3-generic.cpp \
++	r3/posix/RTFileQueryFsSizes-posix.cpp \
++	r3/posix/RTHandleGetStandard-posix.cpp \
++	r3/posix/RTMemProtect-posix.cpp \
++	r3/posix/RTPathUserHome-posix.cpp \
++	r3/posix/RTSystemQueryOSInfo-posix.cpp \
++	r3/freebsd/RTSystemQueryTotalRam-freebsd.cpp \
  	r3/posix/RTTimeNow-posix.cpp \
  	r3/posix/RTTimeSet-posix.cpp \
  	r3/posix/dir-posix.cpp \
+@@ -1333,6 +1411,8 @@ VBoxRT_SOURCES.darwin         += \
+ 	r3/posix/fileaio-posix.cpp
+ VBoxRT_SOURCES.freebsd        += \
+ 	r3/freebsd/fileaio-freebsd.cpp
++VBoxRT_SOURCES.netbsd        += \
++	r3/freebsd/fileaio-freebsd.cpp
+ VBoxRT_INCS                   := $(RuntimeR3_INCS)
+ VBoxRT_INCS.$(KBUILD_TARGET)  := $(RuntimeR3_INCS.$(KBUILD_TARGET))
+ VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
+@@ -1367,6 +1447,9 @@ VBoxRT_LIBS.darwin             = \
+ VBoxRT_LIBS.freebsd            = \
+ 	iconv \
+ 	rt
++VBoxRT_LIBS.netbsd            = \
++	iconv \
++	rt
+ VBoxRT_LIBS.haiku              = \
+ 	iconv
+ VBoxRT_LIBS.solaris            = \
+@@ -1469,6 +1552,9 @@ VBoxRT-x86_LIBS.darwin             = \
+ VBoxRT-x86_LIBS.freebsd            = \
+ 	iconv \
+ 	rt
++VBoxRT-x86_LIBS.netbsd            = \
++	iconv \
++	rt
+ VBoxRT-x86_LIBS.haiku              = \
+ 	iconv
+ VBoxRT-x86_LIBS.solaris            = \
+@@ -1644,7 +1730,7 @@ RuntimeR0_SOURCES      := \
+ 	\
+ 	$(RuntimeNoCrt_SOURCES)
+ 
+-if1of ($(KBUILD_TARGET), darwin solaris freebsd)
++if1of ($(KBUILD_TARGET), darwin solaris freebsd netbsd)
+ RuntimeR0_SOURCES += \
+ 	common/math/gcc/adddi3.c \
+ 	common/math/gcc/anddi3.c \
+@@ -1721,6 +1807,8 @@ RuntimeR0Drv_DEFS.linux = MODULE KBUILD_
+ RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT) include
+ RuntimeR0Drv_INCS.freebsd = \
+ 	$(PATH_STAGE)/gen-sys-hdrs
++RuntimeR0Drv_INCS.netbsd = \
++	$(PATH_STAGE)/gen-sys-hdrs
+ RuntimeR0Drv_INCS.linux = \
+ 	r0drv/linux
+ RuntimeR0Drv_INCS.solaris = \
+@@ -2138,6 +2226,40 @@ RuntimeR0Drv_SOURCES.freebsd = \
+ 	r0drv/memobj-r0drv.cpp \
+ 	r0drv/powernotification-r0drv.c
+ 
++RuntimeR0Drv_SOURCES.netbsd = \
++	common/misc/thread.cpp \
++	common/string/memchr.asm \
++	common/string/memmove.asm \
++	common/string/strpbrk.cpp \
++	common/string/memcmp.asm \
++	common/string/strchr.asm \
++	generic/RTAssertShouldPanic-generic.cpp \
++	generic/RTLogWriteDebugger-generic.cpp \
++	generic/RTLogWriteStdOut-stub-generic.cpp \
++	generic/RTTimerCreate-generic.cpp \
++	generic/mppresent-generic.cpp \
++	r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp \
++	r0drv/generic/mpnotification-r0drv-generic.cpp \
++	r0drv/generic/threadctxhooks-r0drv-generic.cpp \
++	r0drv/freebsd/alloc-r0drv-freebsd.c \
++	r0drv/freebsd/assert-r0drv-freebsd.c \
++	r0drv/freebsd/initterm-r0drv-freebsd.c \
++	r0drv/freebsd/memobj-r0drv-freebsd.c \
++	r0drv/freebsd/memuserkernel-r0drv-freebsd.c \
++	r0drv/freebsd/process-r0drv-freebsd.c \
++	r0drv/freebsd/semevent-r0drv-freebsd.c \
++	r0drv/freebsd/semeventmulti-r0drv-freebsd.c \
++	r0drv/freebsd/semfastmutex-r0drv-freebsd.c \
++	r0drv/freebsd/semmutex-r0drv-freebsd.c \
++	r0drv/freebsd/spinlock-r0drv-freebsd.c \
++	r0drv/freebsd/thread-r0drv-freebsd.c \
++	r0drv/freebsd/thread2-r0drv-freebsd.c \
++	r0drv/freebsd/time-r0drv-freebsd.c \
++	r0drv/freebsd/mp-r0drv-freebsd.c \
++	generic/timer-generic.cpp \
++	r0drv/memobj-r0drv.cpp \
++	r0drv/powernotification-r0drv.c
++
+ RuntimeR0Drv_SOURCES.solaris = \
+ 	common/misc/thread.cpp \
+ 	common/string/memchr.asm \
+@@ -2210,6 +2332,9 @@ RuntimeR0Drv_ORDERDEPS.freebsd = \
+ 	$(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
+ 	$(PATH_STAGE)/gen-sys-hdrs/device_if.h
+ 
++RuntimeR0Drv_ORDERDEPS.netbsd = \
++	$(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
++	$(PATH_STAGE)/gen-sys-hdrs/device_if.h
+ 
+ #
+ # RuntimeGuestR0 - Guest driver runtime.
+@@ -2305,7 +2430,7 @@ ifdef VBOX_WITH_RAW_MODE
+   RuntimeRC_SOURCES += os2/sys0.asm
+  endif
+ 
+- if1of ($(KBUILD_TARGET), darwin solaris freebsd)
++ if1of ($(KBUILD_TARGET), darwin solaris freebsd netbsd)
+   RuntimeRC_SOURCES += \
+  	common/math/gcc/adddi3.c \
+  	common/math/gcc/anddi3.c \
+@@ -2453,7 +2578,7 @@ $(IPRT_OUT_DIR)/errmsgvboxcomdata.h.ts +
+ 	$(QUIET)$(CP) --changed -fv $(IPRT_OUT_DIR)/errmsgvboxcomdata.h.ts $(IPRT_OUT_DIR)/errmsgvboxcomdata.h
+ 
+ 
+-if "$(KBUILD_TARGET)" == "freebsd"
++if "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "netbsd"
+ #
+ # FreeBSDGeneratedKernelHeaders - Generate some kernel interface headers.
+ #
Home | Main Index | Thread Index | Old Index