summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-02-28 18:31:06 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-02-28 18:31:06 +0000
commit9a1585ff1b33259a967376e597a52d52e8409977 (patch)
treec9a07a2ab55878dfad2f28b92d92b61427caab2f /app-emulation/qemu
parentzaphfc fixes by Stefan "stkn" Knoblich, closes bug #406189 by Ogelpre. These ... (diff)
downloadhistorical-9a1585ff1b33259a967376e597a52d52e8409977.tar.gz
historical-9a1585ff1b33259a967376e597a52d52e8409977.tar.bz2
historical-9a1585ff1b33259a967376e597a52d52e8409977.zip
Switch to upstream's '--disable-debug-info' to avoid OOM bug #355861.
Package-Manager: portage-2.2.0_alpha89_p3/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r--app-emulation/qemu/ChangeLog5
-rw-r--r--app-emulation/qemu/Manifest14
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild11
3 files changed, 21 insertions, 9 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index a4734d9c97ad..241c9ac3a6fb 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,9 @@
# 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.104 2012/02/25 21:03:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.105 2012/02/28 18:31:06 slyfox Exp $
+
+ 28 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Switch to upstream's '--disable-debug-info' to avoid OOM bug #355861.
25 Feb 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.0-r3.ebuild:
When building with USE=static, zlib needs to be built with USE=static-libs.
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 211ec9334715..e8f397379146 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
AUX qemu-0.11.1-CVE-2012-0029-backport.patch 1448 RMD160 efdf7bfe481bbfec2106d4a1652ec4df3242eb97 SHA1 dd44a1c1224c90f93bfcb19c612c6920325e6624 SHA256 fb739ca478977f17b73489823b92d8964da1bb308db997596e1160900f2c9236
AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
@@ -10,6 +13,13 @@ EBUILD qemu-0.11.1-r1.ebuild 4919 RMD160 f447972f186a5128ba80b2c8c5bce8871fa38fd
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-1.0-r3.ebuild 7183 RMD160 3cee854cb53c594baf8517f1d647b833c65527b0 SHA1 f418241d7cc8cc37b5d37ac3829f59eef29eb4d4 SHA256 fb7cbfb3fe85ba73d1ea266848c11a2063aa87e0f522ff1623ce7a305815aa73
-EBUILD qemu-9999.ebuild 6846 RMD160 143fc27d9b83de0e7d3f0c0569922356db0fd090 SHA1 f1f849c7d68917ea4c174af2010e5418987c418a SHA256 7057db195e4312c6456e90603295a14debc2d869aad090b7d87bf40023273a9f
-MISC ChangeLog 15332 RMD160 a019811324692071b873e2a043940bce74f86aae SHA1 298dc84fcb0bb859275fa33713787c9a63985532 SHA256 236a056fc6fa5c619eda2fc746196189ef0bb2f8a4c0c13cf48d71db0a3b19fc
+EBUILD qemu-9999.ebuild 6818 RMD160 851fad1946e4202508ed063d551fbb1c7d234351 SHA1 a04a53b3640710538406b847ad18df4532b0ab1d SHA256 64e9b4019450de2a454cf0bc9ab458657212d1ee62fb3bdddef86be553060d99
+MISC ChangeLog 15477 RMD160 a7ec07eda56148ff74657ab81ed9bf6a8328f92a SHA1 0dee9cc18d6dc277b9f79acdab46801e35ade727 SHA256 83694644dfe57935ce20437e475211e46a751336c34491df9c1870b91fb1e48d
MISC metadata.xml 2575 RMD160 d53217a49f76391725580cb4ebb22c0ed43588bf SHA1 0b1f51a4bf30e8899cb0379e14eba26c6aa00b7f SHA256 a07e1dd5932d91789f481394b318cf20f4c5a529168b8e5adb299736a643b94b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk9NHoIACgkQcaHudmEf86qVSwCfaaMiMmZidAVweh0ika7k4DAa
+HtYAn0p0yNAWSQ1JoEmx6jxZYiIMN0yH
+=LvNc
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 27bdd582aa51..13f248e2013d 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.15 2012/01/29 12:18:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.16 2012/02/28 18:31:06 slyfox Exp $
EAPI=4
@@ -132,11 +132,6 @@ src_prepare() {
# prevent docs to get automatically installed
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || 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=
sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
@@ -171,6 +166,10 @@ src_configure() {
# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+ # drop '-g' by default as it tends to eat
+ # A LOT (~2GB) of ram for each job #355861
+ conf_opts="${conf_opts} --disable-debug-info"
+
# Add support for static builds
use static && conf_opts="${conf_opts} --static"