diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2009-11-17 23:06:34 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2009-11-17 23:06:34 +0000 |
| commit | 3a709856a4eae6887bcd4f1b375c68a34cd44463 (patch) | |
| tree | 321869260780beddcb2300bd05e5abacb6d2a1fb /app-emulation/qemu | |
| parent | Make repoman happier. These pass too. (diff) | |
| download | gentoo-2-3a709856a4eae6887bcd4f1b375c68a34cd44463.tar.gz gentoo-2-3a709856a4eae6887bcd4f1b375c68a34cd44463.tar.bz2 gentoo-2-3a709856a4eae6887bcd4f1b375c68a34cd44463.zip | |
Fix bug #287308
(Portage version: 2.1.7.4/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/qemu')
| -rw-r--r-- | app-emulation/qemu/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-0.11.0.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index 9c91fa912aae..cd77c3bb7fad 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.71 2009/11/05 23:39:24 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.72 2009/11/17 23:06:34 lu_zero Exp $ + + 17 Nov 2009; Luca Barbato <lu_zero@gentoo.org> qemu-0.11.0.ebuild: + Fix hardened build, thanks to Xake <xake@rymdraket.net> for the patch and + the notice in bug #287308 05 Nov 2009; Patrick Lauer <patrick@gentoo.org> qemu-0.11.0.ebuild: Fixing bad --disable-gfx-check, closes #286370 diff --git a/app-emulation/qemu/qemu-0.11.0.ebuild b/app-emulation/qemu/qemu-0.11.0.ebuild index ea31fc5beba3..b0dc9bcc951e 100644 --- a/app-emulation/qemu/qemu-0.11.0.ebuild +++ b/app-emulation/qemu/qemu-0.11.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild,v 1.2 2009/11/05 23:39:24 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild,v 1.3 2009/11/17 23:06:34 lu_zero Exp $ EAPI="2" @@ -59,6 +59,8 @@ src_prepare() { [[ -x /sbin/paxctl ]] && \ sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ Makefile.target + # Append CFLAGS while linking + sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak # avoid strip sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \ Makefile Makefile.target */Makefile @@ -116,7 +118,7 @@ src_configure() { target_list="${softmmu_targets} ${user_targets}" - filter-flags -fpie -fstack-protector + filter-flags -fPIE ./configure ${conf_opts} \ --audio-drv-list="$audio_opts" \ |