diff options
Diffstat (limited to 'emulators/virtualbox-ose-71/files/patch-Config.kmk')
| -rw-r--r-- | emulators/virtualbox-ose-71/files/patch-Config.kmk | 73 |
1 files changed, 41 insertions, 32 deletions
diff --git a/emulators/virtualbox-ose-71/files/patch-Config.kmk b/emulators/virtualbox-ose-71/files/patch-Config.kmk index 7aaf90147847..2094c6a0a671 100644 --- a/emulators/virtualbox-ose-71/files/patch-Config.kmk +++ b/emulators/virtualbox-ose-71/files/patch-Config.kmk @@ -1,4 +1,4 @@ ---- Config.kmk.orig 2025-05-10 18:43:02 UTC +--- Config.kmk.orig 2025-10-02 16:43:08 UTC +++ Config.kmk @@ -610,11 +610,11 @@ endif # Enable OSS audio support. @@ -37,6 +37,15 @@ VBOX_WITH_VMSVGA3D = 1 endif # Enable vmsvga (svga2) graphics device variant, 3D part, VGPU10 DX commands +@@ -766,7 +766,7 @@ VBOX_WITH_TPM = 1 + # Enable TPM device emulation support. + VBOX_WITH_TPM = 1 + # Enable libtpms, required for the in process TPM emulation. +-if1of ($(KBUILD_TARGET), linux darwin win solaris) ++if1of ($(KBUILD_TARGET), freebsd linux darwin win solaris) + VBOX_WITH_LIBTPMS = 1 + endif + # Disable keyboard HID Consumer/Desktop control keys passthrough @@ -825,7 +825,7 @@ VBOX_WITH_VBOXMANAGE_NLS = 1 #endif # Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems @@ -46,7 +55,7 @@ VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1 endif # The webservices api. -@@ -1357,10 +1357,6 @@ endif +@@ -1355,10 +1355,6 @@ endif endif endif @@ -57,7 +66,7 @@ ifeq ($(KBUILD_TARGET),haiku) VBOX_WITH_VRDP_RDESKTOP = # Permanent (no working SDL). -@@ -1545,7 +1541,7 @@ ifdef VBOX_OSE +@@ -1543,7 +1539,7 @@ ifdef VBOX_OSE # not yet VBOX_WITH_PLUGIN_CRYPT = VBOX_WITH_DRAG_AND_DROP_PROMISES = @@ -66,7 +75,7 @@ VBOX_WITH_DOCS = VBOX_WITH_DOCS_PACKING = endif -@@ -3680,19 +3676,7 @@ ifndef VBOX_GCC_std +@@ -3669,19 +3665,7 @@ ifndef VBOX_GCC_std # ## @todo consider maxing this out. ifndef VBOX_GCC_std @@ -86,7 +95,7 @@ endif ifndef VBOX_VCC_std if $(VBOX_VCC_TOOL_STEM) >= VCC141 # since 2017 15.3 -@@ -5682,11 +5666,11 @@ ifeq ($(VBOX_LDR_FMT),elf) +@@ -5673,11 +5657,11 @@ ifeq ($(VBOX_LDR_FMT),elf) # Solaris driver signing. TEMPLATE_VBoxR0_POST_CMDS = $(VBOX_SIGN_DRIVER_CMDS) else @@ -100,7 +109,7 @@ VBOX_WITH_VBOXR0_AS_DLL = 1 TEMPLATE_VBoxR0_DLLSUFF = .r0 TEMPLATE_VBoxR0_CFLAGS += -fPIC -@@ -5697,7 +5681,7 @@ ifeq ($(VBOX_LDR_FMT),elf) +@@ -5688,7 +5672,7 @@ ifeq ($(VBOX_LDR_FMT),elf) else TEMPLATE_VBoxR0_CFLAGS.amd64 += -mcmodel=kernel TEMPLATE_VBoxR0_CXXFLAGS.amd64 += -mcmodel=kernel @@ -109,7 +118,7 @@ ifdef VBOX_WITH_KMOD_WRAPPED_R0_MODS # For BTF/pahold issue we use -g1 TEMPLATE_VBoxR0_DEFS += VBOX_WITH_KMOD_WRAPPED_R0_MODS TEMPLATE_VBoxR0_LDFLAGS.linux += $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/VBoxR0-wrapped.lds -@@ -6081,7 +6065,7 @@ ifeq ($(KBUILD_TARGET),freebsd) +@@ -6072,7 +6056,7 @@ ifeq ($(KBUILD_TARGET),freebsd) # x86 FreeBSD (6.2 or something): # cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE \ # -nostdinc -I- -I. -I@ -I@/contrib/altq -I@/../include -I/usr/include \ @@ -118,7 +127,7 @@ # -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs \ # -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions \ # -std=c99 -c ../my.c -@@ -6092,7 +6076,7 @@ ifeq ($(KBUILD_TARGET),freebsd) +@@ -6083,7 +6067,7 @@ ifeq ($(KBUILD_TARGET),freebsd) # # AMD64 FreeBSD (7.1): # cc -O2 -fno-strict-aliasing -pipe -D_KERNEL -DKLD_MODULE -std=c99 -nostdinc -I. -I@ -I@/contrib/altq \ @@ -127,7 +136,7 @@ # -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 -ffreestanding \ # -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign \ -@@ -6174,7 +6158,7 @@ ifeq ($(KBUILD_TARGET),freebsd) +@@ -6165,7 +6149,7 @@ ifeq ($(KBUILD_TARGET),freebsd) | xargs -J% objcopy % $(outbase).kld # Link the final .ko (a shared object). @@ -136,7 +145,7 @@ endef endif # x86 -@@ -6209,7 +6193,7 @@ ifeq ($(KBUILD_TARGET),netbsd) +@@ -6200,7 +6184,7 @@ ifeq ($(KBUILD_TARGET),netbsd) $(VBOX_GCC_fdiagnostics-show-option) \ -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ -Wimplicit-function-declaration -Werror-implicit-function-declaration \ @@ -145,7 +154,7 @@ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc -std=c99 -msoft-float TEMPLATE_VBoxR0Drv_CFLAGS.x86 = -m32 -mno-mmx -mno-sse -mno-avx \ -@@ -6220,7 +6204,7 @@ ifeq ($(KBUILD_TARGET),netbsd) +@@ -6211,7 +6195,7 @@ ifeq ($(KBUILD_TARGET),netbsd) -fno-asynchronous-unwind-tables -mno-fp-ret-in-387 TEMPLATE_VBoxR0Drv_CXXFLAGS = -fno-exceptions -fno-rtti \ $(VBOX_GCC_WARN) -Wpointer-arith -Winline \ @@ -154,7 +163,7 @@ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc -msoft-float TEMPLATE_VBoxR0Drv_CXXFLAGS.x86 = $(TEMPLATE_VBoxR0Drv_CFLAGS.x86) -@@ -6528,11 +6512,11 @@ else # the gcc guys +@@ -6519,11 +6503,11 @@ else # the gcc guys TEMPLATE_VBoxR3Exe_LIBS = pthread m rt dl else ifeq ($(KBUILD_TARGET),os2) TEMPLATE_VBoxR3Exe_TOOL = GXX3OMF @@ -168,7 +177,7 @@ TEMPLATE_VBoxR3Exe_SDKS.darwin = $(VBOX_DARWIN_DEF_SDK_SDKS) TEMPLATE_VBoxR3Exe_DEFS.darwin = $(VBOX_DARWIN_DEF_SDK_DEFS) TEMPLATE_VBoxR3Exe_CFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common -@@ -6549,17 +6533,26 @@ else # the gcc guys +@@ -6540,17 +6524,26 @@ else # the gcc guys else ifeq ($(KBUILD_TARGET),haiku) TEMPLATE_VBoxR3Exe_TOOL = GXX3 TEMPLATE_VBoxR3Exe_POST_CMDS = $(VBOX_HAIKU_XRES_SETVER_CMDS) @@ -197,7 +206,7 @@ /usr/include \ /usr/X11R6/include \ /usr/local/include -@@ -6578,7 +6571,7 @@ else # the gcc guys +@@ -6569,7 +6562,7 @@ else # the gcc guys /usr/X11R7/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBoxR3Exe_TOOL = GXX3PLAIN @@ -206,7 +215,7 @@ if $(VBOX_GCC_VERSION_CC) < 30500 TEMPLATE_VBoxR3Exe_CFLAGS += -std=gnu99 endif -@@ -6594,6 +6587,7 @@ else # the gcc guys +@@ -6585,6 +6578,7 @@ else # the gcc guys TEMPLATE_VBoxR3Exe_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)' endif ifdef VBOX_WITH_ORIGIN @@ -214,7 +223,7 @@ TEMPLATE_VBoxR3Exe_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT) endif endif -@@ -6808,7 +6802,7 @@ else +@@ -6799,7 +6793,7 @@ else ifdef VBOX_WITH_NOCRT_STATIC TEMPLATE_VBoxR3StaticBase_DEFS += RT_WITH_NOCRT_WRAPPERS endif @@ -223,7 +232,7 @@ # The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there) TEMPLATE_VBoxR3StaticBase_CFLAGS = $(TEMPLATE_VBoxR3Exe_CFLAGS) -static TEMPLATE_VBoxR3StaticBase_CXXFLAGS = $(TEMPLATE_VBoxR3Exe_CXXFLAGS) -static -@@ -6876,7 +6870,7 @@ else +@@ -6867,7 +6861,7 @@ else $(SDK_VBoxZlib_LIBS) \ $(SDK_VBoxLibLzma_LIBS) if1of ($(KBUILD_TARGET), darwin freebsd) @@ -232,7 +241,7 @@ else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBoxR3Static_LIBS += kstat endif -@@ -7048,6 +7042,7 @@ else ifn1of ($(KBUILD_TARGET), os2) +@@ -7039,6 +7033,7 @@ else ifn1of ($(KBUILD_TARGET), os2) else ifn1of ($(KBUILD_TARGET), os2) ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y. TEMPLATE_VBoxR3HardenedExe_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3Exe_LDFLAGS)) @@ -240,7 +249,7 @@ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.linux)) endif endif -@@ -7079,6 +7074,7 @@ ifn1of ($(KBUILD_TARGET), win os2) +@@ -7070,6 +7065,7 @@ ifn1of ($(KBUILD_TARGET), win os2) $(if-expr !defined(VBOX_WITHOUT_WINDOWS_KERNEL_CODE_SIGNING_CERT),-IntegrityCheck,) ifn1of ($(KBUILD_TARGET), win os2) TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3TstDll_LDFLAGS)) @@ -248,7 +257,7 @@ TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.linux)) endif -@@ -7102,6 +7098,7 @@ ifndef VBOX_WITH_HARDENING +@@ -7093,6 +7089,7 @@ ifndef VBOX_WITH_HARDENING TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)' endif ifdef VBOX_WITH_ORIGIN @@ -256,7 +265,7 @@ TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT) endif endif -@@ -7454,7 +7451,7 @@ else # the GCC guys: +@@ -7445,7 +7442,7 @@ else # the GCC guys: endif TEMPLATE_VBoxMainExe_CXXFLAGS = -g $(VBOX_GCC_pipe) \ $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_Wno-multistatement-macros) $(VBOX_GCC_Wno-class-memaccess) -Wshadow \ @@ -265,7 +274,7 @@ $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK) \ $(VBOX_GCC_SANITIZER_FLAGS) if !defined("VBOX_GCC_Wno-delete-non-virtual-dtor") && defined("VBOX_GCC_Wno-non-virtual-dtor") -@@ -7518,10 +7515,19 @@ else # the GCC guys: +@@ -7509,10 +7506,19 @@ else # the GCC guys: else ifeq ($(KBUILD_TARGET),haiku) TEMPLATE_VBoxMainExe_TOOL = GXX3 TEMPLATE_VBoxMainExe_LIBS = $(LIB_RUNTIME) network stdc++ supc++ @@ -286,7 +295,7 @@ /usr/include \ /usr/X11R6/include \ /usr/local/include -@@ -7553,6 +7559,7 @@ else # the GCC guys: +@@ -7544,6 +7550,7 @@ else # the GCC guys: TEMPLATE_VBoxMainExe_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)' endif ifdef VBOX_WITH_ORIGIN @@ -294,7 +303,7 @@ TEMPLATE_VBoxMainExe_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT) endif -@@ -8181,14 +8188,13 @@ ifdef VBOX_WITH_QTGUI +@@ -8172,14 +8179,13 @@ ifdef VBOX_WITH_QTGUI TEMPLATE_VBoxQtGuiExe_LIBPATH += \ $(VBOX_LIBPATH_X11) ifeq ($(KBUILD_TARGET),freebsd) @@ -312,7 +321,7 @@ endif ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBoxQtGuiExe_LDFLAGS.solaris = -Wl,-z,ignore # Same as VBOX_LD_as_needed. -@@ -8460,7 +8466,7 @@ else +@@ -8451,7 +8457,7 @@ else TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl else ifeq ($(KBUILD_HOST),os2) TEMPLATE_VBoxBldProg_TOOL = GXX3OMF @@ -321,7 +330,7 @@ else ifeq ($(KBUILD_HOST),darwin) TEMPLATE_VBoxBldProg_TOOL = $(VBOX_GCC_TOOL) if "$(VBOX_DEF_MACOSX_VERSION_MIN)" == "10.7" || "$(VBOX_DARWIN_HOST_VERSION_MAJOR)" == "7" -@@ -8500,13 +8506,20 @@ else +@@ -8491,13 +8497,20 @@ else TEMPLATE_VBoxBldProg_LIBS = else ifeq ($(KBUILD_HOST),haiku) TEMPLATE_VBoxBldProg_TOOL = GXX3 @@ -344,7 +353,7 @@ /usr/include \ /usr/X11R6/include \ /usr/local/include -@@ -8553,11 +8566,11 @@ TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \ +@@ -8544,11 +8557,11 @@ TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \ $(TEMPLATE_VBoxBldProg_LIBS) TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \ $(TEMPLATE_VBoxAdvBldProg_LIBS) \ @@ -358,7 +367,7 @@ rt \ $(TEMPLATE_VBoxBldProg_LIBS.freebsd) TEMPLATE_VBoxAdvBldProg_LIBS.linux = \ -@@ -8648,6 +8661,7 @@ else # the gcc guys +@@ -8639,6 +8652,7 @@ else # the gcc guys # Do not inherit sanitizer flags from VBoxR3Exe in guest executables. Deal with them separately. TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS.debug = $(NO_SUCH_VARIABLE) TEMPLATE_VBoxGuestR3ExeBase_CFLAGS.debug = $(NO_SUCH_VARIABLE) @@ -366,7 +375,7 @@ TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LDFLAGS.linux)) TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS.debug = $(NO_SUCH_VARIABLE) TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LDFLAGS)) -@@ -8671,7 +8685,7 @@ else if1of ($(KBUILD_TARGET), darwin freebsd openbsd) +@@ -8662,7 +8676,7 @@ else if1of ($(KBUILD_TARGET), darwin freebsd openbsd) ifeq ($(KBUILD_TARGET),linux) # As few libs as possible on linux. TEMPLATE_VBoxGuestR3ExeBase_LIBS = pthread rt m dl else if1of ($(KBUILD_TARGET), darwin freebsd openbsd) @@ -375,7 +384,7 @@ else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBoxGuestR3ExeBase_LIBS = $(TEMPLATE_$(TEMPLATE_VBoxGuestR3ExeBase_EXTENDS)_LIBS) nsl endif -@@ -8684,6 +8698,7 @@ TEMPLATE_VBoxGuestR3ExeBase_CFLAGS.linux = $(TEMP +@@ -8675,6 +8689,7 @@ TEMPLATE_VBoxGuestR3ExeBase_CFLAGS.linux = $(TEMP $(VBOX_GCC_fno-stack-protector) TEMPLATE_VBoxGuestR3ExeBase_CFLAGS.linux = $(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS.linux) # The GNU_HASH ELF tag is not supported by older systems. @@ -383,7 +392,7 @@ TEMPLATE_VBoxGuestR3ExeBase_LDFLAGS.linux += $(VBOX_LD_hash_style_sysv) -@@ -8929,6 +8944,7 @@ TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TARGET +@@ -8920,6 +8935,7 @@ TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TARGET TEMPLATE_VBoxGuestR3XFree86Mod_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) # The GNU_HASH ELF tag is not supported by older glibc dynamic linkers. @@ -391,7 +400,7 @@ TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.linux = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv)) TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) TEMPLATE_VBoxGuestR3XFree86Mod_LDFLAGS := -r -@@ -8970,7 +8986,7 @@ TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TARGET) = +@@ -8961,7 +8977,7 @@ TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TARGET) = TEMPLATE_VBoxGuestR3XOrgMod_LIBS = $(VBOX_LIB_VBGL_R3_XORG) TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) TEMPLATE_VBoxGuestR3XOrgMod_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) |