virtualbox: Push NetBSD build forward

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jul 9 20:54:17 2016 +0200
Changeset:	f67e8e7ee5a22e7097caacc19ba6f50c3753b507

Modified Files:
	virtualbox/distinfo
	virtualbox/patches/patch-src_VBox_Runtime_Makefile.kmk
Added Files:
	virtualbox/patches/patch-include_iprt_stdint.h

Log Message:
virtualbox: Push NetBSD build forward

1. Disable .m headers generation (specific to FreeBSD)
2. Port iprt/stdint.h to NetBSD

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

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

diffstat:
 virtualbox/distinfo                                |  3 +-
 virtualbox/patches/patch-include_iprt_stdint.h     | 36 +++++++++++++
 .../patches/patch-src_VBox_Runtime_Makefile.kmk    | 62 +++++++++++-----------
 3 files changed, 69 insertions(+), 32 deletions(-)

diffs:
diff --git a/virtualbox/distinfo b/virtualbox/distinfo
index 03bb572..2314d29 100644
--- a/virtualbox/distinfo
+++ b/virtualbox/distinfo
@@ -11,6 +11,7 @@ SHA1 (patch-include_VBox_VBoxGuest.h) = 4f41910ca3abbc502bad31cb9f9b427566025765
 SHA1 (patch-include_VBox_ostypes.h) = fd452f95c79b2e5c98a048af21f6561c80adebc5
 SHA1 (patch-include_VBox_param.h) = 1efcacb3e7890344dc132fee85b945bf9baa9614
 SHA1 (patch-include_VBox_usb.h) = c16d333f6dee240f1d4147cc49c04451dfb776a7
+SHA1 (patch-include_iprt_stdint.h) = b7ab7c1dd77e8d8725c249cc39a58da6c68766f5
 SHA1 (patch-include_iprt_string.h) = dd74a70d35be03f480bbb42db170cf7c5f583e4e
 SHA1 (patch-include_iprt_time.h) = 9940a7b65300990d2fbeb7629813323e8b7971c5
 SHA1 (patch-kBuild_header.kmk) = b08bde255f27e9e62d15c649b16a34d72b4d79f6
@@ -159,7 +160,7 @@ SHA1 (patch-src_VBox_Makefile.kmk) = c6c010cc8fa19c6445d4d03b630a8741ccc3d364
 SHA1 (patch-src_VBox_NetworkServices_NAT_Makefile.kmk) = cb489f3e32ea551faa59f1172500731ab2e74863
 SHA1 (patch-src_VBox_NetworkServices_NAT_pxping.c) = 7e7f3fd26ae5f787e5cb9299d24eea9c4a53529a
 SHA1 (patch-src_VBox_NetworkServices_NAT_pxudp.c) = 56dd97543fd9be4096d4b3aa1fd25075ec4ff7f3
-SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = 103d89bf858e86a43da151095f83ca9a3a276a93
+SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = bb3ff65c3176782146c4a66f8723cdb529979c0a
 SHA1 (patch-src_VBox_Runtime_VBox_log-vbox.cpp) = b833b5e038652518f3c0ad74c699bc0ab57f56d5
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_alloc-r0drv-netbsd.c) = 8d39beeb6c649a68794b17e0cec27fc6acb68fed
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_assert-r0drv-netbsd.c) = a333976118abdc7f6c143c95f648ab9aa51c885e
diff --git a/virtualbox/patches/patch-include_iprt_stdint.h b/virtualbox/patches/patch-include_iprt_stdint.h
new file mode 100644
index 0000000..ec5755b
--- /dev/null
+++ b/virtualbox/patches/patch-include_iprt_stdint.h
@@ -0,0 +1,36 @@
+$NetBSD$
+
+--- include/iprt/stdint.h.orig	2016-03-04 19:23:01.000000000 +0000
++++ include/iprt/stdint.h
+@@ -34,6 +34,7 @@
+  */
+ #if !(defined(RT_OS_LINUX) && defined(__KERNEL__))  \
+   && !(defined(RT_OS_FREEBSD) && defined(_KERNEL)) \
++  && !(defined(RT_OS_NETBSD) && defined(_KERNEL)) \
+   && !defined(_MSC_VER) \
+   && !defined(__IBMC__) \
+   && !defined(__IBMCPP__) \
+@@ -62,7 +63,7 @@
+ #  define UINT32_C(Value)   (Value ## U)
+ # endif /* 64-bit darwin kludge. */
+ 
+-#elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
++#elif (defined(RT_OS_FREEBSD) && defined(_KERNEL)) || (defined(RT_OS_NETBSD) && defined(_KERNEL))
+ 
+ # ifndef __STDC_CONSTANT_MACROS
+ #  define __STDC_CONSTANT_MACROS
+@@ -157,7 +158,8 @@ typedef uint64_t            uintmax_t;
+ # if !defined(_MSC_VER) || defined(DOXYGEN_RUNNING)
+ #  if ARCH_BITS == 32 \
+    || defined(RT_OS_LINUX) \
+-   || defined(RT_OS_FREEBSD)
++   || defined(RT_OS_FREEBSD) \
++   || defined(RT_OS_NETBSD)
+ #   if !defined(_INTPTR_T_DECLARED)  && !defined(_INTPTR_T)
+ typedef signed long         intptr_t;
+ #   endif
+@@ -241,4 +243,3 @@ typedef uint64_t            uintptr_t;
+ #endif
+ 
+ #endif
+-
diff --git a/virtualbox/patches/patch-src_VBox_Runtime_Makefile.kmk b/virtualbox/patches/patch-src_VBox_Runtime_Makefile.kmk
index 1ef49c9..a062a1e 100644
--- a/virtualbox/patches/patch-src_VBox_Runtime_Makefile.kmk
+++ b/virtualbox/patches/patch-src_VBox_Runtime_Makefile.kmk
@@ -175,9 +175,9 @@ $NetBSD$
  	$(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
++#RuntimeR0Drv_ORDERDEPS.netbsd = \
++#	$(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
++#	$(PATH_STAGE)/gen-sys-hdrs/device_if.h
 +
  
  #
@@ -195,7 +195,7 @@ $NetBSD$
  	$(QUIET)$(RM) $(@D)/pci_if.m
  endif # FreeBSD
  
-+if "$(KBUILD_TARGET)" == "netbsd"
++#if "$(KBUILD_TARGET)" == "netbsd"
 +#
 +# NetBSDGeneratedKernelHeaders - Generate some kernel interface headers.
 +#
@@ -207,33 +207,33 @@ $NetBSD$
 +# generate the header next to the source. So, we'll have to temporarily copy
 +# the source file to the destination directory to work.
 +#
-+VBOX_AWK := /usr/bin/awk
-+INSTALLS += NetBSDGeneratedKernelHeaders
-+NetBSDGeneratedKernelHeaders_INST = gen-sys-hdrs/
-+NetBSDGeneratedKernelHeaders_SOURCES = \
-+	$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/bus_if.h \
-+	$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/device_if.h \
-+	$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/pci_if.h
-+NetBSDGeneratedKernelHeaders_CLEAN = $(NetBSDGeneratedKernelHeaders_SOURCES)
-+
-+$$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/bus_if.h: $(VBOX_NETBSD_SRC)/kern/bus_if.m | $$(dir $$@)
-+	$(call MSG_TOOL,awk,NetBSDGeneratedKernelHeaders,$<,$@)
-+	$(QUIET)$(CP) -f $< $(@D)/bus_if.m
-+	$(QUIET)$(VBOX_AWK) -f $(VBOX_NETBSD_SRC)/tools/makeobjops.awk $(@D)/bus_if.m -h -p
-+	$(QUIET)$(RM) $(@D)/bus_if.m
-+
-+$$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/device_if.h: $(VBOX_NETBSD_SRC)/kern/device_if.m | $$(dir $$@)
-+	$(call MSG_TOOL,awk,NetBSDGeneratedKernelHeaders,$<,$@)
-+	$(QUIET)$(CP) -f $< $(@D)/device_if.m
-+	$(QUIET)$(VBOX_AWK) -f $(VBOX_NETBSD_SRC)/tools/makeobjops.awk $(@D)/device_if.m -h -p
-+	$(QUIET)$(RM) $(@D)/device_if.m
-+
-+$$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/pci_if.h: $(VBOX_NETBSD_SRC)/dev/pci/pci_if.m | $$(dir $$@)
-+	$(call MSG_TOOL,awk,NetBSDGeneratedKernelHeaders,$<,$@)
-+	$(QUIET)$(CP) -f $< $(@D)/pci_if.m
-+	$(QUIET)$(VBOX_AWK) -f $(VBOX_NETBSD_SRC)/tools/makeobjops.awk $(@D)/pci_if.m -h -p
-+	$(QUIET)$(RM) $(@D)/pci_if.m
-+endif # NetBSD
++#VBOX_AWK := /usr/bin/awk
++#INSTALLS += NetBSDGeneratedKernelHeaders
++#NetBSDGeneratedKernelHeaders_INST = gen-sys-hdrs/
++#NetBSDGeneratedKernelHeaders_SOURCES = \
++#	$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/bus_if.h \
++#	$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/device_if.h \
++#	$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/pci_if.h
++#NetBSDGeneratedKernelHeaders_CLEAN = $(NetBSDGeneratedKernelHeaders_SOURCES)
++#
++#$$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/bus_if.h: $(VBOX_NETBSD_SRC)/kern/bus_if.m | $$(dir $$@)
++#	$(call MSG_TOOL,awk,NetBSDGeneratedKernelHeaders,$<,$@)
++#	$(QUIET)$(CP) -f $< $(@D)/bus_if.m
++#	$(QUIET)$(VBOX_AWK) -f $(VBOX_NETBSD_SRC)/tools/makeobjops.awk $(@D)/bus_if.m -h -p
++#	$(QUIET)$(RM) $(@D)/bus_if.m
++#
++#$$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/device_if.h: $(VBOX_NETBSD_SRC)/kern/device_if.m | $$(dir $$@)
++#	$(call MSG_TOOL,awk,NetBSDGeneratedKernelHeaders,$<,$@)
++#	$(QUIET)$(CP) -f $< $(@D)/device_if.m
++#	$(QUIET)$(VBOX_AWK) -f $(VBOX_NETBSD_SRC)/tools/makeobjops.awk $(@D)/device_if.m -h -p
++#	$(QUIET)$(RM) $(@D)/device_if.m
++#
++#$$(NetBSDGeneratedKernelHeaders_0_OUTDIR)/pci_if.h: $(VBOX_NETBSD_SRC)/dev/pci/pci_if.m | $$(dir $$@)
++#	$(call MSG_TOOL,awk,NetBSDGeneratedKernelHeaders,$<,$@)
++#	$(QUIET)$(CP) -f $< $(@D)/pci_if.m
++#	$(QUIET)$(VBOX_AWK) -f $(VBOX_NETBSD_SRC)/tools/makeobjops.awk $(@D)/pci_if.m -h -p
++#	$(QUIET)$(RM) $(@D)/pci_if.m
++#endif # NetBSD
 +
  
  #