Attachment #193356 for bug #228219

View | Details | Raw Unified | Return to bug 228219
Collapse All | Expand All

Lines 3-8 Link Here

(-)Makefile (+1 lines)
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.2.12	5	PORTVERSION= 5.2.12
		6	PORTREVISION= 1
6	CATEGORIES= emulators	7	CATEGORIES= emulators
7	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/	8	MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
8	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	9	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}




--- Config.kmk.orig	2018-05-09 16:31:59 UTC
+++ Config.kmk
@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
  # Enable OSS audio support.
  VBOX_WITH_AUDIO_OSS = 1
 endif

  # Enable PulseAudio audio support.
  VBOX_WITH_AUDIO_PULSE = 1
 endif
@@ -461,11 +461,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
 # Enable PCI passthrough support.
 VBOX_WITH_PCI_PASSTHROUGH = 1
 # Enable statically linked dbus support.

  VBOX_WITH_PAM = 1
 endif
 # Enable internal networking.
@@ -667,7 +667,7 @@ VBOX_WITH_TESTCASES = 1
 VBOX_WITH_VDITOOL =
 # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
 VBOX_WITH_VBOX_IMG =

  # Enables the video capturing support.
  VBOX_WITH_VIDEOREC = 1
  # Enable VPX (VP8 / VP9 codec), used for video capturing.
@@ -995,10 +995,6 @@ ifeq ($(KBUILD_TARGET),darwin)
  VBOX_WITH_VBOXSDL=
 endif
 

 ifeq ($(KBUILD_TARGET),haiku)
  # Don't bother with SDL ttf for now.
  VBOX_WITH_SECURELABEL=
@@ -1158,7 +1154,7 @@ ifdef VBOX_OSE
  VBOX_WITH_KCHMVIEWER=
  VBOX_WITH_PLUGIN_CRYPT=
  VBOX_WITH_DRAG_AND_DROP_PROMISES=

   VBOX_WITH_DOCS=
   VBOX_WITH_DOCS_PACKING=
  endif
@@ -4454,7 +4450,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS              =  \
 	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
 	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
 	-nostdinc -std=c99

 TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
 	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
 	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
@@ -4791,12 +4787,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS            += -fno-pic
 TEMPLATE_VBOXR3EXE_TOOL                = GXX3
 TEMPLATE_VBOXR3EXE_LIBS                = pthread
 TEMPLATE_VBOXR3EXE_INCS               += \

 	/usr/local/lib
  else ifeq ($(KBUILD_TARGET),netbsd)
 TEMPLATE_VBOXR3EXE_TOOL                = GXX3
@@ -4949,8 +4941,8 @@ ifeq ($(KBUILD_TARGET),win)
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib
-else ifn1of ($(KBUILD_TARGET), darwin linux solaris)
- # The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there)
+else ifn1of ($(KBUILD_TARGET), darwin freebsd linux solaris)
+ # The gcc guys sans darwin, freebsd, linux and solaris (don't depend on statically compiled system libs there)
  TEMPLATE_VBOXR3STATIC_CFLAGS          = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static
  TEMPLATE_VBOXR3STATIC_CXXFLAGS        = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static
  TEMPLATE_VBOXR3STATIC_OBJCFLAGS       = $(TEMPLATE_VBOXR3EXE_OBJCFLAGS) -static
@@ -5086,7 +5078,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)

  # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
  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))
@@ -5617,12 +5609,8 @@ TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTI
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
 TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
 TEMPLATE_VBOXMAINEXE_INCS               += \

 	/usr/local/lib
  else ifeq ($(KBUILD_TARGET),netbsd)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
@@ -6156,12 +6144,8 @@ ifdef VBOX_WITH_QTGUI
 	$(VBOX_LIBPATH_X11)
    ifeq ($(KBUILD_TARGET),freebsd)
     TEMPLATE_VBOXQTGUIEXE_INCS += \

 	/usr/local/lib
    endif
    ifeq ($(KBUILD_TARGET),solaris)
@@ -6384,12 +6368,8 @@ TEMPLATE_VBoxBldProg_LIBPATH            += \
 TEMPLATE_VBoxBldProg_TOOL                = GXX3
 TEMPLATE_VBoxBldProg_LIBS                = pthread
 TEMPLATE_VBoxBldProg_INCS               += \

 	/usr/local/lib
  else ifeq ($(KBUILD_HOST),netbsd)
 TEMPLATE_VBoxBldProg_TOOL                = GXX3
@@ -6792,6 +6772,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin  += \
 	-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

Return to bug 228219

Lines 1-6 Link Here

(-)files/patch-Config.kmk (-13 / +24 lines)
1	--- Config.kmk.orig 2017-10-18 07:06:30 UTC	1	--- Config.kmk.orig 2018-05-09 16:31:59 UTC
2	+++ Config.kmk	2	+++ Config.kmk
3	@@ -424,11 +424,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)	3	@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
4	# Enable OSS audio support.	4	# Enable OSS audio support.
5	VBOX_WITH_AUDIO_OSS = 1	5	VBOX_WITH_AUDIO_OSS = 1
6	endif	6	endif
Lines 14-20 Link Here
14	# Enable PulseAudio audio support.	14	# Enable PulseAudio audio support.
15	VBOX_WITH_AUDIO_PULSE = 1	15	VBOX_WITH_AUDIO_PULSE = 1
16	endif	16	endif
17	@@ -440,11 +440,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1	17	@@ -461,11 +461,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
18	# Enable PCI passthrough support.	18	# Enable PCI passthrough support.
19	VBOX_WITH_PCI_PASSTHROUGH = 1	19	VBOX_WITH_PCI_PASSTHROUGH = 1
20	# Enable statically linked dbus support.	20	# Enable statically linked dbus support.
Lines 28-34 Link Here
28	VBOX_WITH_PAM = 1	28	VBOX_WITH_PAM = 1
29	endif	29	endif
30	# Enable internal networking.	30	# Enable internal networking.
31	@@ -648,7 +648,7 @@ VBOX_WITH_TESTCASES = 1	31	@@ -667,7 +667,7 @@ VBOX_WITH_TESTCASES = 1
32	VBOX_WITH_VDITOOL =	32	VBOX_WITH_VDITOOL =
33	# Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled	33	# Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
34	VBOX_WITH_VBOX_IMG =	34	VBOX_WITH_VBOX_IMG =
Lines 37-43 Link Here
37	# Enables the video capturing support.	37	# Enables the video capturing support.
38	VBOX_WITH_VIDEOREC = 1	38	VBOX_WITH_VIDEOREC = 1
39	# Enable VPX (VP8 / VP9 codec), used for video capturing.	39	# Enable VPX (VP8 / VP9 codec), used for video capturing.
40	@@ -978,10 +978,6 @@ ifeq ($(KBUILD_TARGET),darwin)	40	@@ -995,10 +995,6 @@ ifeq ($(KBUILD_TARGET),darwin)
41	VBOX_WITH_VBOXSDL=	41	VBOX_WITH_VBOXSDL=
42	endif	42	endif
43		43
Lines 48-54 Link Here
48	ifeq ($(KBUILD_TARGET),haiku)	48	ifeq ($(KBUILD_TARGET),haiku)
49	# Don't bother with SDL ttf for now.	49	# Don't bother with SDL ttf for now.
50	VBOX_WITH_SECURELABEL=	50	VBOX_WITH_SECURELABEL=
51	@@ -1141,7 +1137,7 @@ ifdef VBOX_OSE	51	@@ -1158,7 +1154,7 @@ ifdef VBOX_OSE
52	VBOX_WITH_KCHMVIEWER=	52	VBOX_WITH_KCHMVIEWER=
53	VBOX_WITH_PLUGIN_CRYPT=	53	VBOX_WITH_PLUGIN_CRYPT=
54	VBOX_WITH_DRAG_AND_DROP_PROMISES=	54	VBOX_WITH_DRAG_AND_DROP_PROMISES=
Lines 57-63 Link Here
57	VBOX_WITH_DOCS=	57	VBOX_WITH_DOCS=
58	VBOX_WITH_DOCS_PACKING=	58	VBOX_WITH_DOCS_PACKING=
59	endif	59	endif
60	@@ -4360,7 +4356,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \	60	@@ -4454,7 +4450,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
61	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \	61	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
62	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \	62	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
63	-nostdinc -std=c99	63	-nostdinc -std=c99
Lines 66-72 Link Here
66	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \	66	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
67	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \	67	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
68	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef	68	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
69	@@ -4689,12 +4685,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic	69	@@ -4791,12 +4787,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic
70	TEMPLATE_VBOXR3EXE_TOOL = GXX3	70	TEMPLATE_VBOXR3EXE_TOOL = GXX3
71	TEMPLATE_VBOXR3EXE_LIBS = pthread	71	TEMPLATE_VBOXR3EXE_LIBS = pthread
72	TEMPLATE_VBOXR3EXE_INCS += \	72	TEMPLATE_VBOXR3EXE_INCS += \
Lines 79-85 Link Here
79	/usr/local/lib	79	/usr/local/lib
80	else ifeq ($(KBUILD_TARGET),netbsd)	80	else ifeq ($(KBUILD_TARGET),netbsd)
81	TEMPLATE_VBOXR3EXE_TOOL = GXX3	81	TEMPLATE_VBOXR3EXE_TOOL = GXX3
82	@@ -4984,7 +4976,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!	82	@@ -4949,8 +4941,8 @@ ifeq ($(KBUILD_TARGET),win)
		83	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
		84	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
		85	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib
		86	-else ifn1of ($(KBUILD_TARGET), darwin linux solaris)
		87	- # The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there)
		88	+else ifn1of ($(KBUILD_TARGET), darwin freebsd linux solaris)
		89	+ # The gcc guys sans darwin, freebsd, linux and solaris (don't depend on statically compiled system libs there)
		90	TEMPLATE_VBOXR3STATIC_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static
		91	TEMPLATE_VBOXR3STATIC_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static
		92	TEMPLATE_VBOXR3STATIC_OBJCFLAGS = $(TEMPLATE_VBOXR3EXE_OBJCFLAGS) -static
		93	@@ -5086,7 +5078,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
83	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain	94	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain
84	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)	95	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)
85	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)	96	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
Lines 88-94 Link Here
88	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)	99	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
89	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))	100	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
90	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))	101	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
91	@@ -5515,12 +5507,8 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI	102	@@ -5617,12 +5609,8 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
92	TEMPLATE_VBOXMAINEXE_TOOL = GXX3	103	TEMPLATE_VBOXMAINEXE_TOOL = GXX3
93	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME)	104	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME)
94	TEMPLATE_VBOXMAINEXE_INCS += \	105	TEMPLATE_VBOXMAINEXE_INCS += \
Lines 101-107 Link Here
101	/usr/local/lib	112	/usr/local/lib
102	else ifeq ($(KBUILD_TARGET),netbsd)	113	else ifeq ($(KBUILD_TARGET),netbsd)
103	TEMPLATE_VBOXMAINEXE_TOOL = GXX3	114	TEMPLATE_VBOXMAINEXE_TOOL = GXX3
104	@@ -6054,12 +6042,8 @@ ifdef VBOX_WITH_QTGUI	115	@@ -6156,12 +6144,8 @@ ifdef VBOX_WITH_QTGUI
105	$(VBOX_LIBPATH_X11)	116	$(VBOX_LIBPATH_X11)
106	ifeq ($(KBUILD_TARGET),freebsd)	117	ifeq ($(KBUILD_TARGET),freebsd)
107	TEMPLATE_VBOXQTGUIEXE_INCS += \	118	TEMPLATE_VBOXQTGUIEXE_INCS += \
Lines 114-120 Link Here
114	/usr/local/lib	125	/usr/local/lib
115	endif	126	endif
116	ifeq ($(KBUILD_TARGET),solaris)	127	ifeq ($(KBUILD_TARGET),solaris)
117	@@ -6282,12 +6266,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \	128	@@ -6384,12 +6368,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \
118	TEMPLATE_VBoxBldProg_TOOL = GXX3	129	TEMPLATE_VBoxBldProg_TOOL = GXX3
119	TEMPLATE_VBoxBldProg_LIBS = pthread	130	TEMPLATE_VBoxBldProg_LIBS = pthread
120	TEMPLATE_VBoxBldProg_INCS += \	131	TEMPLATE_VBoxBldProg_INCS += \
Lines 127-133 Link Here
127	/usr/local/lib	138	/usr/local/lib
128	else ifeq ($(KBUILD_HOST),netbsd)	139	else ifeq ($(KBUILD_HOST),netbsd)
129	TEMPLATE_VBoxBldProg_TOOL = GXX3	140	TEMPLATE_VBoxBldProg_TOOL = GXX3
130	@@ -6707,6 +6687,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \	141	@@ -6792,6 +6772,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \
131	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \	142	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
132	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)	143	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
133	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed	144	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed