mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 12:40:45 -04:00
137 lines
5.7 KiB
Text
137 lines
5.7 KiB
Text
--- Config.kmk.orig 2017-10-18 07:06:30 UTC
|
|
+++ Config.kmk
|
|
@@ -424,11 +424,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
|
|
# Enable OSS audio support.
|
|
VBOX_WITH_AUDIO_OSS = 1
|
|
endif
|
|
-if1of ($(KBUILD_TARGET), linux)
|
|
+if1of ($(KBUILD_TARGET), freebsd linux)
|
|
# Enable ALSA audio support.
|
|
VBOX_WITH_AUDIO_ALSA = 1
|
|
endif
|
|
-if1of ($(KBUILD_TARGET), linux)
|
|
+if1of ($(KBUILD_TARGET), freebsd linux)
|
|
# Enable PulseAudio audio support.
|
|
VBOX_WITH_AUDIO_PULSE = 1
|
|
endif
|
|
@@ -440,11 +440,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
|
|
# Enable PCI passthrough support.
|
|
VBOX_WITH_PCI_PASSTHROUGH = 1
|
|
# Enable statically linked dbus support.
|
|
-if1of ($(KBUILD_TARGET), linux solaris)
|
|
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
|
|
VBOX_WITH_DBUS = 1
|
|
endif
|
|
# Enable building PAM modules.
|
|
-if1of ($(KBUILD_TARGET), linux solaris)
|
|
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
|
|
VBOX_WITH_PAM = 1
|
|
endif
|
|
# Enable internal networking.
|
|
@@ -648,7 +648,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 =
|
|
-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)
|
|
# Enables the video capturing support.
|
|
VBOX_WITH_VIDEOREC = 1
|
|
# Enable VPX (VP8 / VP9 codec), used for video capturing.
|
|
@@ -978,10 +978,6 @@ ifeq ($(KBUILD_TARGET),darwin)
|
|
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=
|
|
@@ -1141,7 +1137,7 @@ ifdef VBOX_OSE
|
|
VBOX_WITH_KCHMVIEWER=
|
|
VBOX_WITH_PLUGIN_CRYPT=
|
|
VBOX_WITH_DRAG_AND_DROP_PROMISES=
|
|
- ifn1of ($(KBUILD_TARGET), linux)
|
|
+ ifn1of ($(KBUILD_TARGET), freebsd linux)
|
|
VBOX_WITH_DOCS=
|
|
VBOX_WITH_DOCS_PACKING=
|
|
endif
|
|
@@ -4360,7 +4356,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.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
|
|
@@ -4689,12 +4685,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic
|
|
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),netbsd)
|
|
TEMPLATE_VBOXR3EXE_TOOL = GXX3
|
|
@@ -4984,7 +4976,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)
|
|
-else ifn1of ($(KBUILD_TARGET), os2 solaris)
|
|
+else ifn1of ($(KBUILD_TARGET), freebsd os2 solaris)
|
|
# 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))
|
|
@@ -5515,12 +5507,8 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
|
|
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),netbsd)
|
|
TEMPLATE_VBOXMAINEXE_TOOL = GXX3
|
|
@@ -6054,12 +6042,8 @@ ifdef VBOX_WITH_QTGUI
|
|
$(VBOX_LIBPATH_X11)
|
|
ifeq ($(KBUILD_TARGET),freebsd)
|
|
TEMPLATE_VBOXQTGUIEXE_INCS += \
|
|
- /usr/include \
|
|
- /usr/X11R6/include \
|
|
/usr/local/include
|
|
TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
|
|
- /usr/lib \
|
|
- /usr/X11R6/lib \
|
|
/usr/local/lib
|
|
endif
|
|
ifeq ($(KBUILD_TARGET),solaris)
|
|
@@ -6282,12 +6266,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \
|
|
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),netbsd)
|
|
TEMPLATE_VBoxBldProg_TOOL = GXX3
|
|
@@ -6707,6 +6687,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
|
|
+TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.freebsd = -Wl,--no-as-needed
|
|
TEMPLATE_VBOXCROGLR3HOSTDLL_BLDDIRS = $(VBOX_PATH_CROGL_GENFILES)/
|
|
ifeq ($(KBUILD_TARGET),darwin)
|
|
TEMPLATE_VBOXCROGLR3HOSTDLL_CFLAGS = $(TEMPLATE_VBOXR3NP_CFLAGS) -Wno-deprecated-declarations
|