virtualbox: Fix detection of pkgsrc paths and remove build warnings on NetBSD

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: virtualbox: Fix detection of pkgsrc paths and remove build warnings on NetBSD
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Fri, 08 Jul 2016 15:21:21 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Jul 8 17:21:21 2016 +0200
Changeset:	97051ffe4f98ac54c9f8647017020cb68c8712d3

Modified Files:
	virtualbox/Makefile
	virtualbox/distinfo
	virtualbox/patches/patch-src_VBox_HostDrivers_Support_netbsd_files__vboxdrv
Added Files:
	virtualbox/patches/patch-kBuild_header.kmk

Log Message:
virtualbox: Fix detection of pkgsrc paths and remove build warnings on NetBSD

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

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

diffstat:
 virtualbox/Makefile                                |  3 +
 virtualbox/distinfo                                |  3 +-
 virtualbox/patches/patch-kBuild_header.kmk         | 92 ++++++++++++++++++++++
 ..._VBox_HostDrivers_Support_netbsd_files__vboxdrv |  6 +-
 4 files changed, 99 insertions(+), 5 deletions(-)

diffs:
diff --git a/virtualbox/Makefile b/virtualbox/Makefile
index 8507b0f..24dbb8a 100644
--- a/virtualbox/Makefile
+++ b/virtualbox/Makefile
@@ -21,6 +21,8 @@ BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
 BUILD_DEPENDS+=	kbuild-[0-9]*:../../devel/kbuild
 BUILD_DEPENDS+=	acpica-utils-[0-9]*:../../sysutils/acpica-utils
 
+TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
+
 USE_TOOLS+=	gtar pkg-config bison flex
 
 WRKSRC=		${WRKDIR}/VirtualBox-${PKGVERSION_NOREV}
@@ -75,6 +77,7 @@ SUBST_SED.paths+=	-e 's!PYTHONLIBRPATH=.*!PYTHONLIBRPATH="${COMPILER_RPATH_FLAG}
 VBLIBDIR=	${PREFIX}/lib/virtualbox
 
 KMK_ENV_VARS+=	KBUILD_PATH=${WRKSRC}/kBuild
+KMK_ENV_VARS+=	KBUILD_LIB_SEARCH_ROOTS="/ /usr/ ${X11BASE}/ ${PREFIX}/"
 # Multiple jobs tend to be broken
 KMK_FLAGS+=	-j1
 
diff --git a/virtualbox/distinfo b/virtualbox/distinfo
index bd14db2..8501da0 100644
--- a/virtualbox/distinfo
+++ b/virtualbox/distinfo
@@ -12,6 +12,7 @@ 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_string.h) = dd74a70d35be03f480bbb42db170cf7c5f583e4e
+SHA1 (patch-kBuild_header.kmk) = b08bde255f27e9e62d15c649b16a34d72b4d79f6
 SHA1 (patch-src_VBox_Additions_Makefile.kmk) = e47ebb5cbfb51d103f76e1316b18e835fb5d6b1d
 SHA1 (patch-src_VBox_Additions_common_VBoxGuestLib_VBoxGuestR3Lib.cpp) = 99138a3a7abd00e74c50f0fdc841ac7984e11a08
 SHA1 (patch-src_VBox_Additions_common_VBoxGuestLib_VBoxGuestR3LibLog.cpp) = e0b83d8785a8bfe000c6467d125d3b45c1517ff7
@@ -92,7 +93,7 @@ SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_SUPDrv-netbsd.c) = fbc5fd6f45657
 SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_SUPDrv-netbsd.def) = 85eb317c813e124b1b9556f9cdb5725ec6278f8f
 SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_SUPLib-netbsd.cpp) = b6690a459513a372be5200381fcb34b6e5b220d9
 SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_SUPR0IdcClient-netbsd.c) = dd51dbf5274d223424124fb29886d8737f02bce7
-SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_files__vboxdrv) = 16bfd494b5f406cfb1824b62a6c568db1befc16f
+SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_files__vboxdrv) = b2d6c50361f6709ad6d2bec4632074cc36233959
 SHA1 (patch-src_VBox_HostDrivers_VBoxNetAdp_Makefile.kmk) = 5d2bf3d9bd06e1deaab8060c17aed30fd80411d0
 SHA1 (patch-src_VBox_HostDrivers_VBoxNetAdp_VBoxNetAdpInternal.h) = d738f197a2d3a736f56aff5005fed7756c543827
 SHA1 (patch-src_VBox_HostDrivers_VBoxNetAdp_netbsd_Makefile) = 5fa21e33796ca01d143abac5c6f6537a233676ab
diff --git a/virtualbox/patches/patch-kBuild_header.kmk b/virtualbox/patches/patch-kBuild_header.kmk
new file mode 100644
index 0000000..d6d3e1a
--- /dev/null
+++ b/virtualbox/patches/patch-kBuild_header.kmk
@@ -0,0 +1,92 @@
+$NetBSD$
+
+--- kBuild/header.kmk.orig	2015-09-15 23:36:00.000000000 +0000
++++ kBuild/header.kmk
+@@ -610,10 +610,10 @@ SUFF_OBJ    := .o
+ SUFF_LIB    := .a
+ SUFF_DLL    := .so
+ SUFF_EXE    :=
+- if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) ## @todo check netbsd and openbsd.
++ if1of ($(KBUILD_TARGET), dragonfly freebsd linux openbsd) ## @todo check openbsd.
+ SUFF_SYS    := .ko
+  else
+-SUFF_SYS    :=
++SUFF_SYS    := .kmod
+  endif
+ SUFF_RES    :=
+ endif
+@@ -1278,66 +1278,9 @@ endif
+ #    KBUILD_LIB_SEARCH_ROOTS - Roots to search for library subdirs.
+ #    KBUILD_LIB_SEARCH_PATHS - ROOTS + SUBS.
+ #
+-ifeq ($(KBUILD_TARGET),darwin)
+- KBUILD_LIB_SEARCH_ROOTS := \
+-	/usr/ \
+-	/Developer/usr/
+- KBUILD_LIB_SEARCH_SUBS  := lib/
+-
+-else if1of ($(KBUILD_TARGET), freebsd netbsd openbsd dragonfly)
+- KBUILD_LIB_SEARCH_ROOTS := \
+-	/ \
+-	/usr/ \
+-	/usr/local/
+- KBUILD_LIB_SEARCH_SUBS := lib/
+-
+-else ifeq ($(KBUILD_TARGET),linux)
+- ifeq ($(realpath /bin),/usr/bin)
+-  KBUILD_LIB_SEARCH_ROOTS := \
+-  	/usr/ \
+-  	/ \
+-  	/usr/local/
+- else
+-  KBUILD_LIB_SEARCH_ROOTS := \
+-  	/ \
+-  	/usr/ \
+-  	/usr/local/
+- endif
+- ifeq ($(KBUILD_TARGET_ARCH),amd64)
+-  KBUILD_LIB_SEARCH_SUBS := \
+-	lib/x86_64-linux-gnu/ \
+-	lib64/ \
+-	lib/
+- else ifeq ($(KBUILD_TARGET_ARCH),x86)
+-  KBUILD_LIB_SEARCH_SUBS := \
+-	lib/i686-linux-gnu/ \
+-	lib/i386-linux-gnu/ \
+-	lib32/ \
+-	lib/
+- else
+-  KBUILD_LIB_SEARCH_SUBS := lib/
+- endif
+-
+-else ifeq ($(KBUILD_TARGET),solaris)
+- KBUILD_LIB_SEARCH_ROOTS := \
+-	/ \
+-	/usr/ \
+-	/usr/sfw/ \
+-	/usr/local/ \
+-	/sw/
+- ifeq ($(KBUILD_TARGET_ARCH),amd64)
+-  KBUILD_LIB_SEARCH_SUBS := lib/amd64/ lib/
+- else ifeq ($(KBUILD_TARGET_ARCH),sparc64)
+-  KBUILD_LIB_SEARCH_SUBS := lib/sparcv9/ lib/
+- else
+-  KBUILD_LIB_SEARCH_SUBS := lib/
+- endif
+-
+-else
+- KBUILD_LIB_SEARCH_SUBS  :=
+- KBUILD_LIB_SEARCH_ROOTS :=
+-endif
+-KBUILD_LIB_SEARCH_PATHS  := $(foreach root, $(KBUILD_LIB_SEARCH_ROOTS), $(addprefix $(root),$(KBUILD_LIB_SEARCH_SUBS)))
++KBUILD_LIB_SEARCH_ROOTS ?= / /usr /usr/local
++KBUILD_LIB_SEARCH_SUBS ?= lib/
++KBUILD_LIB_SEARCH_PATHS  ?= $(foreach root, $(KBUILD_LIB_SEARCH_ROOTS), $(addprefix $(root),$(KBUILD_LIB_SEARCH_SUBS)))
+ 
+ 
+ #
+@@ -1617,4 +1560,3 @@ endif
+ # end-of-file-content
+ __header_kmk__ := 1
+ endif # !__header_kmk__
+-
diff --git a/virtualbox/patches/patch-src_VBox_HostDrivers_Support_netbsd_files__vboxdrv b/virtualbox/patches/patch-src_VBox_HostDrivers_Support_netbsd_files__vboxdrv
index 8384c93..9f6ca18 100644
--- a/virtualbox/patches/patch-src_VBox_HostDrivers_Support_netbsd_files__vboxdrv
+++ b/virtualbox/patches/patch-src_VBox_HostDrivers_Support_netbsd_files__vboxdrv
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- src/VBox/HostDrivers/Support/netbsd/files_vboxdrv.orig	2016-07-07 07:08:46.524933547 +0000
+--- src/VBox/HostDrivers/Support/netbsd/files_vboxdrv.orig	2016-07-08 15:09:53.340402555 +0000
 +++ src/VBox/HostDrivers/Support/netbsd/files_vboxdrv
-@@ -0,0 +1,213 @@
+@@ -0,0 +1,211 @@
 +#!/bin/sh
 +#  files_vboxdrv $
 +## @file
@@ -54,7 +54,6 @@ $NetBSD$
 +    ${PATH_ROOT}/include/iprt/mem.h=>include/iprt/mem.h \
 +    ${PATH_ROOT}/include/iprt/memobj.h=>include/iprt/memobj.h \
 +    ${PATH_ROOT}/include/iprt/mp.h=>include/iprt/mp.h \
-+    ${PATH_ROOT}/include/iprt/net.h=>include/iprt/net.h \
 +    ${PATH_ROOT}/include/iprt/param.h=>include/iprt/param.h \
 +    ${PATH_ROOT}/include/iprt/power.h=>include/iprt/power.h \
 +    ${PATH_ROOT}/include/iprt/process.h=>include/iprt/process.h \
@@ -71,7 +70,6 @@ $NetBSD$
 +    ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
 +    ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
 +    ${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
-+    ${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
 +    ${PATH_ROOT}/include/iprt/net.h=>include/iprt/net.h \
 +    ${PATH_ROOT}/include/iprt/rand.h=>include/iprt/rand.h \
 +    ${PATH_ROOT}/include/iprt/path.h=>include/iprt/path.h \
Prev by Date: libcap, Eliminate, imported into pkgsrc
Next by Date: virtualbox: Set of patches pushing the NetBSD build forward
Previous by Thread: libcap, Eliminate, imported into pkgsrc
Next by Thread: virtualbox: Set of patches pushing the NetBSD build forward
Indexes:
Home | Main Index | Thread Index | Old Index