Accepting request 242773 from home:mseben:branches:Virtualization

update to 4.3.14

OBS-URL: https://build.opensuse.org/request/show/242773
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=162
This commit is contained in:
Michal Seben
2014-07-28 19:19:08 +00:00
committed by Git OBS Bridge
parent e9b752b482
commit f5c94e4c43
9 changed files with 576 additions and 867 deletions

View File

@@ -1,8 +1,8 @@
Index: VirtualBox-4.3.6/Config.kmk
Index: VirtualBox-4.3.14/Config.kmk
===================================================================
--- VirtualBox-4.3.6.orig/Config.kmk
+++ VirtualBox-4.3.6/Config.kmk
@@ -3873,10 +3873,13 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
--- VirtualBox-4.3.14.orig/Config.kmk
+++ VirtualBox-4.3.14/Config.kmk
@@ -3963,6 +3963,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
ifeq ($(KBUILD_TARGET),linux)
# not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
# TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
@@ -10,7 +10,12 @@ Index: VirtualBox-4.3.6/Config.kmk
+ TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.linux = $(TEMPLATE_VBOXR3EXE_CFLAGS.linux) -fPIE
+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(TEMPLATE_VBOXR3EXE_LDFLAGS.linux) -pie
endif
ifn1of ($(KBUILD_TARGET), win os2)
ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
@@ -3981,8 +3984,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)
TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
else ifn1of ($(KBUILD_TARGET), os2)
- 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