[gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-0.11.0.ebuild ChangeLog

["Luca Barbato (lu_zero)" <lu_zero@gentoo.org>]

lu_zero     09/11/17 23:06:34

  Modified:             qemu-0.11.0.ebuild ChangeLog
  Log:
  Fix bug #287308
  (Portage version: 2.1.7.4/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  app-emulation/qemu/qemu-0.11.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild?r1=1.2&r2=1.3

Index: qemu-0.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu-0.11.0.ebuild	5 Nov 2009 23:39:24 -0000	1.2
+++ qemu-0.11.0.ebuild	17 Nov 2009 23:06:34 -0000	1.3
@@ -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 @@
 	[[ -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 @@
 
 	target_list="${softmmu_targets} ${user_targets}"
 
-	filter-flags -fpie -fstack-protector
+	filter-flags -fPIE
 
 	./configure ${conf_opts} \
 		--audio-drv-list="$audio_opts" \



1.72                 app-emulation/qemu/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.71&r2=1.72

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog	5 Nov 2009 23:39:24 -0000	1.71
+++ ChangeLog	17 Nov 2009 23:06:34 -0000	1.72
@@ -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