diff options
| -rw-r--r-- | app-emulation/qemu/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/qemu/Manifest | 10 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 12 |
3 files changed, 18 insertions, 12 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index f2a6dbba3830..3fb3c2db0bad 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.101 2012/01/28 11:45:00 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.102 2012/01/29 12:18:34 slyfox Exp $ + + 29 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-1.0-r2.ebuild, + qemu-9999.ebuild: + Respect user's decision whether to generate debug info when build stuff + (related to bug #355861 by Andrew Savchenko). Drop outdated seding of + Makefiles. *qemu-0.11.1-r1 (28 Jan 2012) diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index a899192f92b8..63a3519cd589 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -11,13 +11,13 @@ DIST qemu-1.0.tar.gz 10848714 RMD160 3a60aef6cfebba6896bdb12c99525da5456172fd SH EBUILD qemu-0.11.1-r1.ebuild 4919 RMD160 f447972f186a5128ba80b2c8c5bce8871fa38fde SHA1 e09fd89788f6d628ac4701e31f43282023fe7c4a SHA256 571c7ea28e703e86d1ca5be1eacb7b9249b9bec16527355eed38d721e56b13ea EBUILD qemu-0.11.1.ebuild 4851 RMD160 14c27fb758125ffa52b22562ee910e89e8dc053b SHA1 405d7858cfb66c7ad4ca3f846ad6048f3f59d49b SHA256 0cccf6126e9ddb442ff37e1c5b3be9ba095059323cf63b9ee0f707e2876f1123 EBUILD qemu-1.0-r2.ebuild 6912 RMD160 1155a584070a3ecabd696335c7c301b936f22d95 SHA1 96c3ce1bd440025541ef08751d03478eff78bd46 SHA256 0b9afc45f9af381e672c632faa5c15aab60b65cae4b4380aea57721df286879a -EBUILD qemu-9999.ebuild 6937 RMD160 4432f7bda60db3c57847a8a8c030972eae133248 SHA1 134bead98a8e9025fb59f0c7d7b8a3c03c7e7826 SHA256 fde00cf0f292746ed743f70d6ff0a9d11b91e545776f8fc3cf6db9a412c7a22f -MISC ChangeLog 14789 RMD160 f4ea132a0839f167c8da7ce43d371ed519c7aede SHA1 286444ae1ae61daf11aa0425ff36bc6bd07bccde SHA256 3e94e1757d304cae2202f8faa5d4b7647f80b90de445f82eacd2878b920c5fd9 +EBUILD qemu-9999.ebuild 6846 RMD160 143fc27d9b83de0e7d3f0c0569922356db0fd090 SHA1 f1f849c7d68917ea4c174af2010e5418987c418a SHA256 7057db195e4312c6456e90603295a14debc2d869aad090b7d87bf40023273a9f +MISC ChangeLog 15043 RMD160 9288dc7ce114becede3c4574ad93f7619044720e SHA1 da454036c4975735eda0d28525d7feb098e639c2 SHA256 d4605e36f0da65272e23de120aa5e43acf7d2db9f1221f6a4fb38ff70944b4ee MISC metadata.xml 2575 RMD160 d53217a49f76391725580cb4ebb22c0ed43588bf SHA1 0b1f51a4bf30e8899cb0379e14eba26c6aa00b7f SHA256 a07e1dd5932d91789f481394b318cf20f4c5a529168b8e5adb299736a643b94b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk8j4MkACgkQcaHudmEf86oAEwCdER9rphURxSGjn6P43IJzUB05 -6oIAnjDWqqTUvexLC++6IER+/k0MuH3t -=mR9l +iEYEARECAAYFAk8lOioACgkQcaHudmEf86rsUgCeLSlRioIvVAO92yXSvn+J0Wm3 +mkoAni0l+s+85pkMSEq5Ue3EJlTh0/2g +=UKY7 -----END PGP SIGNATURE----- diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index e2fd0fe558bc..27bdd582aa51 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.14 2012/01/27 21:35:16 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.15 2012/01/29 12:18:34 slyfox Exp $ EAPI=4 @@ -131,11 +131,11 @@ pkg_setup() { src_prepare() { # prevent docs to get automatically installed sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - # append CFLAGS while linking - sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die + + # drop '-g' by default as it tends to eat + # A LOT (~2GB) of ram for each job #355861 + sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \ + -i configure || die # Fix underlinking. # Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS= |