Attachment 212150 Details for Bug 244603 – svn(1) diff against the ports tree

[patch] svn(1) diff against the ports tree

virtualbox.diff (text/plain), 17.07 KB, created by Kyle Evans on 2020-03-05 04:25:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2020-03-05 04:25:03 UTC

Size: 17.07 KB

patch

obsolete

>Index: emulators/virtualbox-ose/Makefile
>===================================================================
>--- emulators/virtualbox-ose/Makefile	(revision 527805)
>+++ emulators/virtualbox-ose/Makefile	(working copy)
>@@ -15,6 +15,7 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
> BUILD_DEPENDS=	yasm:devel/yasm \
> 		xsltproc:textproc/libxslt \
> 		kmk:devel/kBuild \
>@@ -29,8 +30,13 @@
> 
> WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
> ONLY_FOR_ARCHS=	i386 amd64
>-USES=		compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2
>+USES=		cpe gnome iconv pkgconfig ssl tar:bzip2
> USE_GNOME=	libidl libxml2
>+# machine/atomic.h may use features that are only available in GCC9.  This is
>+# a workaround, anyways- we should be expressing USES= compiler:c++14-lang, but
>+# contemporary clang miscompiles virtualbox in some fashion and yields runtime
>+# breakage.
>+USE_GCC=	9
> 
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-java --passive-mesa
>@@ -201,20 +207,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${COMPILER_TYPE} == clang
>-.if ${COMPILER_VERSION} >= 80
>-# XXX PR236616: Clang 8 & 9 caused runtime problems.
>-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
>-CC=		${LOCALBASE}/bin/clang${VBOX_LLVM_VER}
>-CXX=		${LOCALBASE}/bin/clang++${VBOX_LLVM_VER}
>-VBOX_LLVM_VER?=	70
>-.endif
>-PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
>-EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk \
>-		${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk \
>-		${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk
>-.endif
>-
> .if ${PYTHON_MAJOR_VER} >= 3
> PLIST_SUB+=	PYTHON_PYCDIR=/__pycache__/ \
> 		PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
>@@ -286,7 +278,6 @@
> 	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
> 	    ${WRKSRC}/LocalConfig.kmk
> .endif
>-.if ${COMPILER_TYPE} == clang
> 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
> 	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
> 	@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
>@@ -295,7 +286,6 @@
> 	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \
> 	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
> 	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
>-.endif
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
> 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
> 	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
>Index: emulators/virtualbox-ose/files/extrapatch-Config.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/extrapatch-Config.kmk	(revision 527805)
>+++ emulators/virtualbox-ose/files/extrapatch-Config.kmk	(nonexistent)
>@@ -1,27 +0,0 @@
>---- 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
>
>Property changes on: emulators/virtualbox-ose/files/extrapatch-Config.kmk
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk	(revision 527805)
>+++ emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig	2013-11-29 14:23:32.000000000 -0500
>-+++ src/VBox/Devices/PC/ipxe/Makefile.kmk	2013-12-13 15:06:45.000000000 -0500
>-@@ -35,7 +35,7 @@
>- iPxeBiosBin_CLEAN    = \
>- 	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
>- 
>--if1of ($(KBUILD_TARGET), darwin os2 solaris win)
>-+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
>-  $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@)
>- 	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
>- 	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@
>
>Property changes on: emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk	(revision 527805)
>+++ emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk	(nonexistent)
>@@ -1,10 +0,0 @@
>---- src/recompiler/Makefile.kmk.orig	2013-11-29 14:25:09.000000000 -0500
>-+++ src/recompiler/Makefile.kmk	2013-12-13 14:23:11.000000000 -0500
>-@@ -41,6 +41,7 @@
>- #
>- ifneq ($(KBUILD_TARGET),win)
>-  VBoxRemPrimary_TEMPLATE       = VBOXR3NP
>-+ VBoxRemPrimary_TOOL.freebsd   = VBoxGccFreeBSD
>-  # workaround the regparm bug in gcc <= 3.3
>-  VBoxRemPrimary_DEFS           = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,)
>- else
>
>Property changes on: emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/patch-Config.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/patch-Config.kmk	(revision 527805)
>+++ emulators/virtualbox-ose/files/patch-Config.kmk	(working copy)
>@@ -1,4 +1,4 @@
>---- Config.kmk.orig	2019-05-13 13:12:00 UTC
>+--- 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.
>@@ -74,7 +74,23 @@
>   # 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
>-@@ -4575,7 +4571,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS              =  \
>+@@ -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
>@@ -83,7 +99,16 @@
>  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
>-@@ -4622,7 +4618,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
>+@@ -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).
>@@ -92,7 +117,7 @@
>  endef
>   endif # x86
>  
>-@@ -4908,10 +4904,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH            += \
>+@@ -4956,10 +4954,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH            += \
>  TEMPLATE_VBOXR3EXE_CFLAGS             += -fno-pic
>  TEMPLATE_VBOXR3EXE_CXXFLAGS           += -fno-pic
>  TEMPLATE_VBOXR3EXE_LDFLAGS            += -fno-pic
>@@ -112,7 +137,7 @@
>  	/usr/include \
>  	/usr/X11R6/include \
>  	/usr/local/include
>-@@ -5202,7 +5206,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
>+@@ -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)
>@@ -121,7 +146,7 @@
>   # 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))
>-@@ -5729,10 +5733,18 @@ TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTI
>+@@ -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++
>@@ -141,7 +166,7 @@
>  	/usr/include \
>  	/usr/X11R6/include \
>  	/usr/local/include
>-@@ -6271,13 +6283,10 @@ ifdef VBOX_WITH_QTGUI
>+@@ -6319,13 +6333,10 @@ ifdef VBOX_WITH_QTGUI
>     TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
>  	$(VBOX_LIBPATH_X11)
>     ifeq ($(KBUILD_TARGET),freebsd)
>@@ -156,7 +181,7 @@
>  	/usr/local/lib
>     endif
>     ifeq ($(KBUILD_TARGET),solaris)
>-@@ -6500,12 +6509,8 @@ TEMPLATE_VBoxBldProg_LIBPATH            += \
>+@@ -6548,12 +6559,8 @@ TEMPLATE_VBoxBldProg_LIBPATH            += \
>  TEMPLATE_VBoxBldProg_TOOL                = GXX3
>  TEMPLATE_VBoxBldProg_LIBS                = pthread
>  TEMPLATE_VBoxBldProg_INCS               += \
>@@ -169,7 +194,7 @@
>  	/usr/local/lib
>   else ifeq ($(KBUILD_HOST),netbsd)
>  TEMPLATE_VBoxBldProg_TOOL                = GXX3
>-@@ -6906,6 +6911,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin  += \
>+@@ -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
>Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk	(nonexistent)
>+++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig	2013-11-29 14:23:32.000000000 -0500
>++++ src/VBox/Devices/PC/ipxe/Makefile.kmk	2013-12-13 15:06:45.000000000 -0500
>+@@ -35,7 +35,7 @@
>+ iPxeBiosBin_CLEAN    = \
>+ 	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
>+ 
>+-if1of ($(KBUILD_TARGET), darwin os2 solaris win)
>++if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
>+  $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@)
>+ 	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
>+ 	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@
>
>Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk	(nonexistent)
>+++ emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/recompiler/Makefile.kmk.orig	2013-11-29 14:25:09.000000000 -0500
>++++ src/recompiler/Makefile.kmk	2013-12-13 14:23:11.000000000 -0500
>+@@ -41,6 +41,7 @@
>+ #
>+ ifneq ($(KBUILD_TARGET),win)
>+  VBoxRemPrimary_TEMPLATE       = VBOXR3NP
>++ VBoxRemPrimary_TOOL.freebsd   = VBoxGccFreeBSD
>+  # workaround the regparm bug in gcc <= 3.3
>+  VBoxRemPrimary_DEFS           = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,)
>+ else
>
>Property changes on: emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 244603: 212150