Attachment #212150 for bug #244603

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

Lines 15-20 Link Here

(-)emulators/virtualbox-ose/Makefile (-17 / +7 lines)
15	LICENSE= GPLv2	15	LICENSE= GPLv2
16	LICENSE_FILE= ${WRKSRC}/COPYING	16	LICENSE_FILE= ${WRKSRC}/COPYING
17		17
		18	PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
18	BUILD_DEPENDS= yasm:devel/yasm \	19	BUILD_DEPENDS= yasm:devel/yasm \
19	xsltproc:textproc/libxslt \	20	xsltproc:textproc/libxslt \
20	kmk:devel/kBuild \	21	kmk:devel/kBuild \
Lines 29-36 Link Here
29		30
30	WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}	31	WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
31	ONLY_FOR_ARCHS= i386 amd64	32	ONLY_FOR_ARCHS= i386 amd64
32	USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2	33	USES= cpe gnome iconv pkgconfig ssl tar:bzip2
33	USE_GNOME= libidl libxml2	34	USE_GNOME= libidl libxml2
		35	# machine/atomic.h may use features that are only available in GCC9. This is
		36	# a workaround, anyways- we should be expressing USES= compiler:c++14-lang, but
		37	# contemporary clang miscompiles virtualbox in some fashion and yields runtime
		38	# breakage.
		39	USE_GCC= 9
34		40
35	HAS_CONFIGURE= yes	41	HAS_CONFIGURE= yes
36	CONFIGURE_ARGS= --disable-java --passive-mesa	42	CONFIGURE_ARGS= --disable-java --passive-mesa
Lines 201-220 Link Here
201		207
202	.include <bsd.port.pre.mk>	208	.include <bsd.port.pre.mk>
203		209
204	.if ${COMPILER_TYPE} == clang
205	.if ${COMPILER_VERSION} >= 80
206	# XXX PR236616: Clang 8 & 9 caused runtime problems.
207	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
208	CC= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER}
209	CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER}
210	VBOX_LLVM_VER?= 70
211	.endif
212	PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
213	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \
214	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk \
215	${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk
216	.endif
217
218	.if ${PYTHON_MAJOR_VER} >= 3	210	.if ${PYTHON_MAJOR_VER} >= 3
219	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \	211	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
220	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc	212	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
Lines 286-292 Link Here
286	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \	278	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
287	${WRKSRC}/LocalConfig.kmk	279	${WRKSRC}/LocalConfig.kmk
288	.endif	280	.endif
289	.if ${COMPILER_TYPE} == clang
290	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \	281	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \
291	-e 's\| -mpreferred-stack-boundary=2\|\|' ${WRKSRC}/Config.kmk	282	-e 's\| -mpreferred-stack-boundary=2\|\|' ${WRKSRC}/Config.kmk
292	@${REINPLACE_CMD} -e 's\| -fpermissive\|\|' ${WRKSRC}/Config.kmk \	283	@${REINPLACE_CMD} -e 's\| -fpermissive\|\|' ${WRKSRC}/Config.kmk \
Lines 295-301 Link Here
295	@${SED} -e 's\|GXX3\|VBoxGccFreeBSD\|g' \	286	@${SED} -e 's\|GXX3\|VBoxGccFreeBSD\|g' \
296	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \	287	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
297	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk	288	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
298	.endif
299	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	289	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
300	${WRKSRC}/Config.kmk ${WRKSRC}/configure \	290	${WRKSRC}/Config.kmk ${WRKSRC}/configure \
301	${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \	291	${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \




--- Config.kmk.orig	2016-07-18 11:50:32 UTC
+++ Config.kmk
@@ -3537,6 +3537,7 @@ ifdef VBOX_WITH_RAW_MODE
  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
  TEMPLATE_VBoxRc_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
  TEMPLATE_VBoxRc_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd    = -fno-builtin
   ifeq ($(KBUILD_TARGET),solaris)
    TEMPLATE_VBoxRc_LDFLAGS           = -r
   else
@@ -3677,6 +3678,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
 TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
 TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
+TEMPLATE_VBoxR0_CXXFLAGS.freebsd    = -fno-builtin
 TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
 TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
 ifeq ($(KBUILD_TARGET),solaris)
@@ -3945,7 +3947,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CM
 		| xargs -J% objcopy % $(out)
 
 ## Strip debug info (comment out if debugging or something).
-	objcopy --strip-debug $(out)
+#	objcopy --strip-debug $(out)
 endef
  else # x86
 TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk (-11 lines)
1	--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500
2	+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500
3	@@ -35,7 +35,7 @@
4	iPxeBiosBin_CLEAN = \
5	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
6
7	-if1of ($(KBUILD_TARGET), darwin os2 solaris win)
8	+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
9	$$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) \| $$(dir $$@)
10	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
11	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk (-10 lines)
1	--- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500
2	+++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500
3	@@ -41,6 +41,7 @@
4	#
5	ifneq ($(KBUILD_TARGET),win)
6	VBoxRemPrimary_TEMPLATE = VBOXR3NP
7	+ VBoxRemPrimary_TOOL.freebsd = VBoxGccFreeBSD
8	# workaround the regparm bug in gcc <= 3.3
9	VBoxRemPrimary_DEFS = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,)
10	else




--- Config.kmk.orig	2019-10-10 18:06:26 UTC
+++ Config.kmk
@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
  # Enable OSS audio support.

  # branding
  VBOX_BRAND_LICENSE_HTML             := $(PATH_ROOT)/doc/License-gpl-2.0.html
  VBOX_BRAND_LICENSE_RTF              := $(PATH_ROOT)/doc/License-gpl-2.0.rtf
@@ -4158,6 +4154,7 @@ ifdef VBOX_WITH_RAW_MODE
  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
  TEMPLATE_VBoxRc_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
  TEMPLATE_VBoxRc_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd    = -fno-builtin
   ifeq ($(KBUILD_TARGET),solaris)
    TEMPLATE_VBoxRc_LDFLAGS           = -r
   else
@@ -4299,6 +4296,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
 TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
 TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
+TEMPLATE_VBoxR0_CXXFLAGS.freebsd    = -fno-builtin
 TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
 TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
 ifeq ($(KBUILD_TARGET),solaris)
@@ -4623,7 +4621,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
@@ -4656,7 +4654,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
 		| xargs -J% objcopy % $(out)
 
 ## Strip debug info (comment out if debugging or something).
-	objcopy --strip-debug $(out)
+#	objcopy --strip-debug $(out)
 endef
  else # x86
 TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld
@@ -4670,7 +4668,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
 		| xargs -J% objcopy % $(outbase).kld
 
 # Link the final .ko (a shared object).

 endef
  endif # x86
 
@@ -4956,10 +4954,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH            += \
 TEMPLATE_VBOXR3EXE_CFLAGS             += -fno-pic
 TEMPLATE_VBOXR3EXE_CXXFLAGS           += -fno-pic
 TEMPLATE_VBOXR3EXE_LDFLAGS            += -fno-pic

 	/usr/include \
 	/usr/X11R6/include \
 	/usr/local/include
@@ -5250,7 +5256,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))
@@ -5777,10 +5783,18 @@ TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTI
  else ifeq ($(KBUILD_TARGET),haiku)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
 TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) network stdc++ supc++

 	/usr/include \
 	/usr/X11R6/include \
 	/usr/local/include
@@ -6319,13 +6333,10 @@ ifdef VBOX_WITH_QTGUI
    TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
 	$(VBOX_LIBPATH_X11)
    ifeq ($(KBUILD_TARGET),freebsd)

 	/usr/local/lib
    endif
    ifeq ($(KBUILD_TARGET),solaris)
@@ -6548,12 +6559,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
@@ -6954,6 +6961,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

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk (+11 lines)
	1	--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500
	2	+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500
	3	@@ -35,7 +35,7 @@
	4	iPxeBiosBin_CLEAN = \
	5	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
	6
	7	-if1of ($(KBUILD_TARGET), darwin os2 solaris win)
	8	+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
	9	$$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) \| $$(dir $$@)
	10	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
	11	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk (+10 lines)
	1	--- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500
	2	+++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500
	3	@@ -41,6 +41,7 @@
	4	#
	5	ifneq ($(KBUILD_TARGET),win)
	6	VBoxRemPrimary_TEMPLATE = VBOXR3NP
	7	+ VBoxRemPrimary_TOOL.freebsd = VBoxGccFreeBSD
	8	# workaround the regparm bug in gcc <= 3.3
	9	VBoxRemPrimary_DEFS = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,)
	10	else

Return to bug 244603

Lines 1-27 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-Config.kmk (-27 lines)
1	--- Config.kmk.orig 2016-07-18 11:50:32 UTC
2	+++ Config.kmk
3	@@ -3537,6 +3537,7 @@ ifdef VBOX_WITH_RAW_MODE
4	TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)
5	TEMPLATE_VBoxRc_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
6	TEMPLATE_VBoxRc_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
7	+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd = -fno-builtin
8	ifeq ($(KBUILD_TARGET),solaris)
9	TEMPLATE_VBoxRc_LDFLAGS = -r
10	else
11	@@ -3677,6 +3678,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
12	TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
13	TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
14	TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
15	+TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -fno-builtin
16	TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
17	TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
18	ifeq ($(KBUILD_TARGET),solaris)
19	@@ -3945,7 +3947,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CM
20	\| xargs -J% objcopy % $(out)
21
22	## Strip debug info (comment out if debugging or something).
23	- objcopy --strip-debug $(out)
24	+# objcopy --strip-debug $(out)
25	endef
26	else # x86
27	TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-Config.kmk (-9 / +34 lines)
1	--- Config.kmk.orig 2019-05-13 13:12:00 UTC	1	--- Config.kmk.orig 2019-10-10 18:06:26 UTC
2	+++ Config.kmk	2	+++ Config.kmk
3	@@ -445,11 +445,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.
Lines 74-80 Link Here
74	# branding	74	# branding
75	VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html	75	VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html
76	VBOX_BRAND_LICENSE_RTF := $(PATH_ROOT)/doc/License-gpl-2.0.rtf	76	VBOX_BRAND_LICENSE_RTF := $(PATH_ROOT)/doc/License-gpl-2.0.rtf
77	@@ -4575,7 +4571,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \	77	@@ -4158,6 +4154,7 @@ ifdef VBOX_WITH_RAW_MODE
		78	TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)
		79	TEMPLATE_VBoxRc_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
		80	TEMPLATE_VBoxRc_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
		81	+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd = -fno-builtin
		82	ifeq ($(KBUILD_TARGET),solaris)
		83	TEMPLATE_VBoxRc_LDFLAGS = -r
		84	else
		85	@@ -4299,6 +4296,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
		86	TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
		87	TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
		88	TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
		89	+TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -fno-builtin
		90	TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
		91	TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
		92	ifeq ($(KBUILD_TARGET),solaris)
		93	@@ -4623,7 +4621,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
78	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \	94	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
79	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \	95	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
80	-nostdinc -std=c99	96	-nostdinc -std=c99
Lines 83-89 Link Here
83	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \	99	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
84	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \	100	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
85	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef	101	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
86	@@ -4622,7 +4618,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS	102	@@ -4656,7 +4654,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
		103	\| xargs -J% objcopy % $(out)
		104
		105	## Strip debug info (comment out if debugging or something).
		106	- objcopy --strip-debug $(out)
		107	+# objcopy --strip-debug $(out)
		108	endef
		109	else # x86
		110	TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld
		111	@@ -4670,7 +4668,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
87	\| xargs -J% objcopy % $(outbase).kld	112	\| xargs -J% objcopy % $(outbase).kld
88		113
89	# Link the final .ko (a shared object).	114	# Link the final .ko (a shared object).
Lines 92-98 Link Here
92	endef	117	endef
93	endif # x86	118	endif # x86
94		119
95	@@ -4908,10 +4904,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \	120	@@ -4956,10 +4954,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \
96	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic	121	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic
97	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic	122	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic
98	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic	123	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic
Lines 112-118 Link Here
112	/usr/include \	137	/usr/include \
113	/usr/X11R6/include \	138	/usr/X11R6/include \
114	/usr/local/include	139	/usr/local/include
115	@@ -5202,7 +5206,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!	140	@@ -5250,7 +5256,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
116	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain	141	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain
117	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)	142	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)
118	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)	143	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
Lines 121-127 Link Here
121	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)	146	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
122	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))	147	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
123	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))	148	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
124	@@ -5729,10 +5733,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI	149	@@ -5777,10 +5783,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
125	else ifeq ($(KBUILD_TARGET),haiku)	150	else ifeq ($(KBUILD_TARGET),haiku)
126	TEMPLATE_VBOXMAINEXE_TOOL = GXX3	151	TEMPLATE_VBOXMAINEXE_TOOL = GXX3
127	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++	152	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++
Lines 141-147 Link Here
141	/usr/include \	166	/usr/include \
142	/usr/X11R6/include \	167	/usr/X11R6/include \
143	/usr/local/include	168	/usr/local/include
144	@@ -6271,13 +6283,10 @@ ifdef VBOX_WITH_QTGUI	169	@@ -6319,13 +6333,10 @@ ifdef VBOX_WITH_QTGUI
145	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \	170	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
146	$(VBOX_LIBPATH_X11)	171	$(VBOX_LIBPATH_X11)
147	ifeq ($(KBUILD_TARGET),freebsd)	172	ifeq ($(KBUILD_TARGET),freebsd)
Lines 156-162 Link Here
156	/usr/local/lib	181	/usr/local/lib
157	endif	182	endif
158	ifeq ($(KBUILD_TARGET),solaris)	183	ifeq ($(KBUILD_TARGET),solaris)
159	@@ -6500,12 +6509,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \	184	@@ -6548,12 +6559,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \
160	TEMPLATE_VBoxBldProg_TOOL = GXX3	185	TEMPLATE_VBoxBldProg_TOOL = GXX3
161	TEMPLATE_VBoxBldProg_LIBS = pthread	186	TEMPLATE_VBoxBldProg_LIBS = pthread
162	TEMPLATE_VBoxBldProg_INCS += \	187	TEMPLATE_VBoxBldProg_INCS += \
Lines 169-175 Link Here
169	/usr/local/lib	194	/usr/local/lib
170	else ifeq ($(KBUILD_HOST),netbsd)	195	else ifeq ($(KBUILD_HOST),netbsd)
171	TEMPLATE_VBoxBldProg_TOOL = GXX3	196	TEMPLATE_VBoxBldProg_TOOL = GXX3
172	@@ -6906,6 +6911,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \	197	@@ -6954,6 +6961,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \
173	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \	198	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
174	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)	199	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
175	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed	200	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed