forked from pool/virtualbox
d8ce0b3983
- Fix build errors for gcc-10 (boo#1167897). File "fixes_for_gcc10.patch" is added. - Convert /usr/bin/VirtualBox to use "~/.config/VirtualBox" instead "~/.vbox". This change was requested in boo#1167660. OBS-URL: https://build.opensuse.org/request/show/789598 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=543
34 lines
1.9 KiB
Diff
34 lines
1.9 KiB
Diff
Index: VirtualBox-6.1.4/Config.kmk
|
|
===================================================================
|
|
--- VirtualBox-6.1.4.orig/Config.kmk
|
|
+++ VirtualBox-6.1.4/Config.kmk
|
|
@@ -2687,7 +2687,6 @@ else
|
|
VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
|
|
$(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
|
|
endif
|
|
-
|
|
# YASM macros
|
|
ifndef DONT_USE_YASM
|
|
include $(KBUILD_PATH)/tools/YASM.kmk
|
|
@@ -5533,6 +5532,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
|
|
ifeq ($(KBUILD_TARGET),linux)
|
|
# not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
|
|
# TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
|
|
+ TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.linux = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.linux) -fPIE
|
|
+ TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.linux = $(TEMPLATE_VBOXR3EXE_CFLAGS.linux) -fPIE
|
|
+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(TEMPLATE_VBOXR3EXE_LDFLAGS.linux) -pie
|
|
endif
|
|
ifeq ($(KBUILD_TARGET),win) # No CRT!
|
|
TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
|
|
@@ -5554,8 +5556,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
|
|
TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
|
|
else ifn1of ($(KBUILD_TARGET), 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))
|
|
+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) -pie
|
|
+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -pie
|
|
endif
|
|
|
|
#
|