Date: Wed, 3 Apr 2019 19:26:43 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497757 - head/emulators/virtualbox-ose/files Message-ID: <201904031926.x33JQhPr032166@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Apr 3 19:26:43 2019 New Revision: 497757 URL: https://svnweb.freebsd.org/changeset/ports/497757 Log: Fix emulators/virtualbox-ose-additions build with lld on i386. Modified: head/emulators/virtualbox-ose/files/patch-Config.kmk Modified: head/emulators/virtualbox-ose/files/patch-Config.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/patch-Config.kmk Wed Apr 3 19:20:52 2019 (r497756) +++ head/emulators/virtualbox-ose/files/patch-Config.kmk Wed Apr 3 19:26:43 2019 (r497757) @@ -1,4 +1,4 @@ ---- Config.kmk.orig 2019-01-14 14:53:56 UTC +--- Config.kmk.orig 2019-01-25 18:24:01 UTC +++ Config.kmk @@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) # Enable OSS audio support. @@ -75,7 +75,7 @@ endif # branding VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html -@@ -4541,7 +4537,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \ +@@ -4556,7 +4552,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 @@ -84,7 +84,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 -@@ -4878,12 +4874,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic +@@ -4603,7 +4599,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS + | xargs -J% objcopy % $(outbase).kld + + # Link the final .ko (a shared object). +- ld $(flags) -Bshareable -o $(out) $(outbase).kld ++ ld $(flags) -Bshareable -znotext -o $(out) $(outbase).kld + endef + endif # x86 + +@@ -4893,12 +4889,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic TEMPLATE_VBOXR3EXE_TOOL = GXX3 TEMPLATE_VBOXR3EXE_LIBS = pthread TEMPLATE_VBOXR3EXE_INCS += \ @@ -97,7 +106,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),netbsd) TEMPLATE_VBOXR3EXE_TOOL = GXX3 -@@ -5168,7 +5160,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! +@@ -5183,7 +5175,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) @@ -106,7 +115,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)) -@@ -5699,12 +5691,8 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI +@@ -5714,12 +5706,8 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI TEMPLATE_VBOXMAINEXE_TOOL = GXX3 TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) TEMPLATE_VBOXMAINEXE_INCS += \ @@ -119,7 +128,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),netbsd) TEMPLATE_VBOXMAINEXE_TOOL = GXX3 -@@ -6238,12 +6226,8 @@ ifdef VBOX_WITH_QTGUI +@@ -6253,12 +6241,8 @@ ifdef VBOX_WITH_QTGUI $(VBOX_LIBPATH_X11) ifeq ($(KBUILD_TARGET),freebsd) TEMPLATE_VBOXQTGUIEXE_INCS += \ @@ -132,7 +141,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -6466,12 +6450,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \ +@@ -6481,12 +6465,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \ TEMPLATE_VBoxBldProg_TOOL = GXX3 TEMPLATE_VBoxBldProg_LIBS = pthread TEMPLATE_VBoxBldProg_INCS += \ @@ -145,7 +154,7 @@ /usr/local/lib else ifeq ($(KBUILD_HOST),netbsd) TEMPLATE_VBoxBldProg_TOOL = GXX3 -@@ -6872,6 +6852,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \ +@@ -6887,6 +6867,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904031926.x33JQhPr032166>