commit: bdc010d90284926bd6b294dd1a590a813044ac93
Author: Zero_Chaos gentoo org>
AuthorDate: Tue Oct 20 16:21:17 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Tue Oct 20 17:27:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc010d9
x11-drivers/xf86-video-virtualbox: fix linking to be more lazy
.../files/xf86-video-virtualbox-4.3.6-link-lazy.patch | 17 -
.../files/xf86-video-virtualbox-link-lazy.patch | 16
...28.ebuild => xf86-video-virtualbox-4.3.28-r1.ebuild} | 6 ++
...30.ebuild => xf86-video-virtualbox-4.3.30-r1.ebuild} | 6 ++
...0.4.ebuild => xf86-video-virtualbox-5.0.4-r1.ebuild} | 6 ++
...0.6.ebuild => xf86-video-virtualbox-5.0.6-r1.ebuild} | 6 ++
6 files changed, 8 insertions(+), 49 deletions(-)
diff --git
a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
deleted file mode 100644
index 1dd6e46..000
---
a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-2012-02-26Magnus Granberg
-
-#394757
-* Config.kmkTEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux add -Wl,-z,lazy
-
-diff -Naurw a/Config.kmk b/Config.kmk
a/Config.kmk 2013-12-18 16:05:32.0 +
-+++ b/Config.kmk 2014-01-11 15:46:48.950785377 +
-@@ -4997,7 +4997,7 @@
- endif
- TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS := $(filter-out $(VBOX_GCC_pipe)
$(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers)
$(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-delete-non-virtual-dtor)
$(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_fvisibility-hidden)
$(VBOX_GCC_fvisibility-inlines-hidden),$(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS))
-pipe
- TEMPLATE_VBOXGUESTR3EXE_CFLAGS:= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS)
-- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux := $(filter-out
$(VBOX_GCC_ORIGIN_OPT)
$(VBOX_LD_as_needed),$(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux))
-+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux := $(filter-out
$(VBOX_GCC_ORIGIN_OPT)
$(VBOX_LD_as_needed),$(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux)) -Wl,-z,lazy
- endif
- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(filter-out
'$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
- endif
diff --git
a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch
b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch
deleted file mode 100644
index 081d4eb..000
---
a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-2012-02-26 Magnus Granberg
-
- #394757
- * Config.kmkTEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux add -Wl,-z,lazy
-
Config.kmk 2011-12-19 13:58:30.0 +0100
-+++ Config.kmk 2012-02-26 12:40:07.497810044 +0100
-@@ -4429,7 +4429,7 @@ else # the gcc guys
- TEMPLATE_VBOXGUESTR3EXE_TOOL:= $(subst
GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
- TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS)
-fno-exceptions
- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(filter-out
'$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
-- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out
$(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
-+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out
$(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -Wl,-z,lazy
- endif
- TEMPLATE_VBOXGUESTR3EXE_INST = $(INST_ADDITIONS)
- TEMPLATE_VBOXGUESTR3EXE_DEFS := $(filter-out $(ARCH_BITS_DEFS),
$(TEMPLATE_VBOXR3EXE_DEFS)) IN_GUEST IN_GUEST_R3 IN_RT_R3
$(VBOX_GC_ARCH_BITS_DEFS)
diff --git
a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
similarity index 97%
rename from
x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
rename to
x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
index 8976e65..66f71bf 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
@@ -87,10 +87,8 @@ src_prepare() {
"${FILESDIR}/${PN}-4-makeself-check.patch" \
"${FILESDIR}/${PN}-4-mkisofs-check.patch"
- # Patch to link with lazy on hardened #394757
- if gcc-specs-now ; then
- epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
- fi
+ # link with lazy on hardened #394757
+ sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk
}
src_configure() {
diff --git
a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild
b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30-r1.ebuild
similarity index 97%
rename from
x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-
