virtualbox-svn: Try to push build forward

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Aug 12 21:47:31 2016 +0200
Changeset:	266c1288de97e285729c62025da0ccbe0dd4dcb7

Modified Files:
	virtualbox-svn/Makefile
	virtualbox-svn/distinfo
	virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk

Log Message:
virtualbox-svn: Try to push build forward

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

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                            |  3 +-
 .../patches/patch-src_VBox_Runtime_Makefile.kmk    | 47 +++++++++++++++++++++-
 3 files changed, 52 insertions(+), 2 deletions(-)

diffs:
diff --git a/virtualbox-svn/Makefile b/virtualbox-svn/Makefile
index b0b8ced..4e7a665 100644
--- a/virtualbox-svn/Makefile
+++ b/virtualbox-svn/Makefile
@@ -54,6 +54,10 @@ KMK_ENV_VARS+=	KBUILD_LIB_SEARCH_ROOTS="/ /usr/ ${X11BASE}/ ${PREFIX}/"
 # Multiple jobs tend to be broken
 KMK_FLAGS+=	-j1
 
+.if ${OPSYS} == "NetBSD"
+BUILDLINK_PASSTHRU_DIRS+=	/usr/src
+.endif
+
 CONFIGURE_ARGS+=	--with-kbuild=${PREFIX}/share/kBuild/
 CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR}
 CONFIGURE_ARGS+=	--with-openssl-incset="-I${BUILDLINK_PREFIX.openssl}/include"
diff --git a/virtualbox-svn/distinfo b/virtualbox-svn/distinfo
index 20cccbe..48aa182 100644
--- a/virtualbox-svn/distinfo
+++ b/virtualbox-svn/distinfo
@@ -10,5 +10,6 @@ SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_postflight) = d073de54d5de4f61e
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_preflight) = f24f7d6dd449e6ad664b8e5a8f5861dd7e0f13e8
 SHA1 (patch-src_VBox_Main_cbinding_VBoxCAPIGlue.c) = 03d23375afaf4448751141bedb7771abc7635f3c
 SHA1 (patch-src_VBox_Main_glue_NativeEventQueue.cpp) = 58ff96858e861b03a495323fd5d6141044ac36f5
-SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = 8f16051a163fed59fe088b523c0e965142e6914b
+SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = 9b59aa4f151abecbbe25ce5d300789cc9ad0c86f
+SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h) = 45e4d9f4a67449099651e96b54b7d108bebe606c
 SHA1 (patch-src_VBox_VMM_testcase_mkdsk.sh) = d949a78be396466636aa2c8d92e6ecf76725f336
diff --git a/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk b/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
index e274bfa..3b039e2 100644
--- a/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
+++ b/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
@@ -11,7 +11,52 @@ $NetBSD$
  RuntimeR0Drv_INCS.solaris = \
  	r0drv/solaris/vbi/i86pc \
  	r0drv/solaris/vbi/i86pc/sys
-@@ -3127,4 +3129,3 @@ taf-template.o taf-template.obj: taf-cor
+@@ -2514,6 +2516,11 @@ RuntimeR0Drv_ORDERDEPS.freebsd = \
+ 	$(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
+ 	$(PATH_STAGE)/gen-sys-hdrs/device_if.h
+ 
++RuntimeR0Drv_ORDERDEPS.netbsd = \
++	$(PATH_STAGE)/machine/bus_defs.h \
++	$(PATH_STAGE)/x86/bus_defs.h \
++	$(PATH_STAGE)/x86/busdefs.h
++
+ 
+ #
+ # RuntimeGuestR0 - Guest driver runtime.
+@@ -2830,6 +2837,32 @@ $$(FreeBSDGeneratedKernelHeaders_0_OUTDI
+ endif # FreeBSD
+ 
+ 
++if "$(KBUILD_TARGET)" == "netbsd"
++# Cherry-pick useful headers and simulate the <machine/*.h> header space
++INSTALLS += NetBSDGeneratedKernelHeadersMachine
++NetBSDGeneratedKernelHeadersMachine_INST = machine/
++NetBSDGeneratedKernelHeadersMachine_SOURCES = \
++	$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/bus_defs.h
++NetBSDGeneratedKernelHeadersMachine_CLEAN = $(NetBSDGeneratedKernelHeadersMachine_SOURCES)
++
++$$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/bus_defs.h: /usr/src/sys/arch/amd64/include/bus_defs.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/bus_defs.h
++
++# Cherry-pick useful headers and simulate the <x86/*.h> header space
++INSTALLS += NetBSDGeneratedKernelHeadersX86
++NetBSDGeneratedKernelHeadersX86_INST = x86/
++NetBSDGeneratedKernelHeadersX86_SOURCES = \
++	$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/bus_defs.h \
++	$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/busdefs.h
++NetBSDGeneratedKernelHeadersX86_CLEAN = $(NetBSDGeneratedKernelHeadersX86_SOURCES)
++
++$$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/bus_defs.h: /usr/src/sys/arch/x86/include/bus_defs.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/bus_defs.h
++
++$$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/busdefs.h: /usr/src/sys/arch/x86/include/busdefs.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/busdefs.h
++endif # NetBSD
++
+ #
+ # Aliases for .cpp.h files so we can more easily do syntax checking from the editor.
+ #
+@@ -3127,4 +3160,3 @@ taf-template.o taf-template.obj: taf-cor
  tsp-template.o tsp-template.obj: tsp-core.o tsp-asn1-decoder.o tsp-sanity.o tsp-init.o
  x509-template.o x509-template.obj: x509-core.o x509-asn1-decoder.o x509-sanity.o x509-init.o
  pkcs7-template.o pkcs7-template.obj: pkcs7-core.o pkcs7-asn1-decoder.o pkcs7-sanity.o pkcs7-init.o