mirror of
https://git.freebsd.org/ports.git
synced 2025-07-17 17:29:23 -04:00
b8592bbae4
turn off AIGLX any more. - Do not install vboxvideo.ko when OPENGL is disabled. It is only required for OpenGL support. - Install vboxvideo.ko.symbols when both DEBUG and OPENGL are enabled. - Do not try to load vboxvideo.ko if it does not exist.
129 lines
5.3 KiB
Text
129 lines
5.3 KiB
Text
--- Config.kmk.orig 2014-07-16 16:59:27.000000000 -0400
|
|
+++ Config.kmk 2014-07-16 17:12:48.000000000 -0400
|
|
@@ -339,7 +339,7 @@
|
|
# Include documentation in the package
|
|
VBOX_WITH_DOCS_PACKING = 1
|
|
# Include CHM when building docs (unset in LocalConfig.kmk to suppress CHM)
|
|
-ifn1of ($(KBUILD_TARGET), linux)
|
|
+ifn1of ($(KBUILD_TARGET), freebsd linux)
|
|
VBOX_WITH_DOCS_CHM = 1
|
|
endif
|
|
# By default only include translations in documentation-only builds
|
|
@@ -602,7 +602,7 @@
|
|
# Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
|
|
VBOX_WITH_VBOX_IMG =
|
|
# Enables the VPX module for VM video capturing
|
|
-if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
|
|
+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
|
|
VBOX_WITH_VPX = 1
|
|
endif
|
|
# Enable shared folders
|
|
@@ -891,10 +891,6 @@
|
|
VBOX_WITH_VBOXSDL=
|
|
endif
|
|
|
|
-ifeq ($(KBUILD_TARGET),freebsd)
|
|
- VBOX_WITH_DOCS=
|
|
-endif
|
|
-
|
|
ifeq ($(KBUILD_TARGET),haiku)
|
|
# Don't bother with SDL ttf for now.
|
|
VBOX_WITH_SECURELABEL=
|
|
@@ -1050,7 +1046,7 @@
|
|
VBOX_WITH_SECURELABEL=
|
|
VBOX_WITH_KCHMVIEWER=
|
|
VBOX_WITH_PLUGIN_CRYPT=
|
|
- ifn1of ($(KBUILD_TARGET), linux)
|
|
+ ifn1of ($(KBUILD_TARGET), freebsd linux)
|
|
VBOX_WITH_DOCS=
|
|
VBOX_WITH_DOCS_PACKING=
|
|
endif
|
|
@@ -3476,16 +3472,16 @@
|
|
$(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \
|
|
-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
|
|
-Wimplicit-function-declaration -Werror-implicit-function-declaration \
|
|
- -O2 -fformat-extensions -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
|
|
+ -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.x86 = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
|
|
+TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
|
|
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
|
|
TEMPLATE_VBOXR0DRV_CXXFLAGS = -fno-exceptions -fno-rtti \
|
|
$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
|
|
- -O2 -fno-format-extensions -fno-strict-aliasing -fno-common -finline-limit=8000 \
|
|
+ -O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \
|
|
$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
|
|
-nostdinc
|
|
TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
|
|
@@ -3719,12 +3715,8 @@
|
|
TEMPLATE_VBOXR3EXE_TOOL = GXX3
|
|
TEMPLATE_VBOXR3EXE_LIBS = pthread
|
|
TEMPLATE_VBOXR3EXE_INCS += \
|
|
- /usr/include \
|
|
- /usr/X11R6/include \
|
|
/usr/local/include
|
|
TEMPLATE_VBOXR3EXE_LIBPATH += \
|
|
- /usr/lib \
|
|
- /usr/X11R6/lib \
|
|
/usr/local/lib
|
|
else ifeq ($(KBUILD_TARGET),solaris)
|
|
TEMPLATE_VBOXR3EXE_TOOL = GXX3PLAIN
|
|
@@ -3982,7 +3974,7 @@
|
|
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)
|
|
-else ifn1of ($(KBUILD_TARGET), os2)
|
|
+else ifn1of ($(KBUILD_TARGET), os2 freebsd)
|
|
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))
|
|
endif
|
|
@@ -4370,12 +4362,8 @@
|
|
TEMPLATE_VBOXMAINEXE_TOOL = GXX3
|
|
TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME)
|
|
TEMPLATE_VBOXMAINEXE_INCS += \
|
|
- /usr/include \
|
|
- /usr/X11R6/include \
|
|
/usr/local/include
|
|
TEMPLATE_VBOXMAINEXE_LIBPATH += \
|
|
- /usr/lib \
|
|
- /usr/X11R6/lib \
|
|
/usr/local/lib
|
|
else ifeq ($(KBUILD_TARGET),solaris)
|
|
TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN
|
|
@@ -4838,12 +4826,8 @@
|
|
$(VBOX_LIBPATH_X11)
|
|
ifeq ($(KBUILD_TARGET),freebsd)
|
|
TEMPLATE_VBOXQT4GUIEXE_INCS += \
|
|
- /usr/include \
|
|
- /usr/X11R6/include \
|
|
/usr/local/include
|
|
TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
|
|
- /usr/lib \
|
|
- /usr/X11R6/lib \
|
|
/usr/local/lib
|
|
endif
|
|
ifeq ($(KBUILD_TARGET),solaris)
|
|
@@ -5035,12 +5019,8 @@
|
|
TEMPLATE_VBoxBldProg_TOOL = GXX3
|
|
TEMPLATE_VBoxBldProg_LIBS = pthread
|
|
TEMPLATE_VBoxBldProg_INCS += \
|
|
- /usr/include \
|
|
- /usr/X11R6/include \
|
|
/usr/local/include
|
|
TEMPLATE_VBoxBldProg_LIBPATH += \
|
|
- /usr/lib \
|
|
- /usr/X11R6/lib \
|
|
/usr/local/lib
|
|
else ifeq ($(KBUILD_HOST),solaris)
|
|
TEMPLATE_VBoxBldProg_TOOL = GXX3PLAIN
|
|
@@ -5427,6 +5407,7 @@
|
|
-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
|
|
+TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.freebsd = -Wl,--no-as-needed
|
|
TEMPLATE_VBOXCROGLR3HOSTDLL_BLDDIRS = $(VBOX_PATH_CROGL_GENFILES)/
|
|
|
|
#
|