Added patces from upstream for '--disable-debug-info' and '--enable-xfsctl'. Fixes configure failure (bug #406851 by Markus Peloquin and others).

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 110 insertions, 9 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index fac0df46fcf8..c9353eebc801 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.107 2012/03/03 17:19:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.108 2012/03/07 17:10:57 slyfox Exp $
+
+  07 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/qemu-1.0-unmagic-debug.patch, +files/qemu-1.0-unmagic-xfsctl.patch,
+  qemu-1.0.1.ebuild:
+  Added patces from upstream for '--disable-debug-info' and '--enable-xfsctl'.
+  Fixes configure failure (bug #406851 by Markus Peloquin and others).
 
 *qemu-1.0.1 (03 Mar 2012)
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index bea3afe3ded0..d1ffa2f64528 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,8 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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-1.0-unmagic-debug.patch 1929 RMD160 c86b8ea8366dd662f520f79967842d32fe33d26d SHA1 a87e85c56aa656e6afcfb7c37430cb5da408bee8 SHA256 dd68fa1abc9e7c9d17bb2407c5a5b80b1302a9c1b24805abe61537b068347659
+AUX qemu-1.0-unmagic-xfsctl.patch 654 RMD160 a3cfa3dcf275c05c484c7ad04700f75ac43658ce SHA1 ddc8eb1060aabda087f0641801668749b6c93e03 SHA256 b69f5fac63fdd61a314373359dc20b1bf0d4eb6bc0e66105032d28c107a81090
 AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
 AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d
 AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 RMD160 53749555d464e56cfab39b0fa2e8120ab2c024db SHA1 9046e72b8c7496840e340f6fc351434b8830f191 SHA256 9a06665c47b76b2501f148713c46f8ce0b14ed03da5e6cb03c0d141f5d91900a
@@ -14,14 +16,14 @@ EBUILD qemu-0.11.1-r1.ebuild 4919 RMD160 f447972f186a5128ba80b2c8c5bce8871fa38fd
 EBUILD qemu-0.11.1.ebuild 4850 RMD160 824fd6898346619a857504aad166fe027111d253 SHA1 a538e6db7670aba1f122267837d23581cf669091 SHA256 f823e8c5d736b76ceb63d4aa2c44487aa33fef12dfb28d6c5a60fbdd4132fa2e
 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-1.0.1.ebuild 7045 RMD160 d5df1747db5e695a549614e9ed8bb673574e554d SHA1 338182f559db345189a9e9b02afd626a1a74a8bd SHA256 12947da067b0a706a7f0a6f7d82f4a0266af7c3c8cc621e230d849f443f920a1
+EBUILD qemu-1.0.1.ebuild 7150 RMD160 23a5b64c3375c7a004bfb363c7d5e7c8f159bd88 SHA1 c831b1ff60e321c37f2cd2f6af5261560b7bb984 SHA256 1d58b19b815bd2b0b60cbe5a0e6b0a4baf7610d42095f776504f9ffc99bd77ed
 EBUILD qemu-9999.ebuild 6818 RMD160 851fad1946e4202508ed063d551fbb1c7d234351 SHA1 a04a53b3640710538406b847ad18df4532b0ab1d SHA256 64e9b4019450de2a454cf0bc9ab458657212d1ee62fb3bdddef86be553060d99
-MISC ChangeLog 15698 RMD160 30f94e023c5f5910a4dcc8b225c0e0f5d077f94e SHA1 868e5926ab20c9a0a7c0859d54c2d5219e027f09 SHA256 499bdefab631929b888ba56a24f384bc68d1bab4de62bc23b2f9c1b939a9b3d6
+MISC ChangeLog 16000 RMD160 9f3c3ce2228327ef0e3d37de2356c5811dd1a829 SHA1 a57a1c341db0fbde6fd366dfc11ff2a2318e1b92 SHA256 de3c9c8f5364ae53fd32c928f14ad8a839edbc025a0d1226335844edcfa9e0a8
 MISC metadata.xml 2575 RMD160 d53217a49f76391725580cb4ebb22c0ed43588bf SHA1 0b1f51a4bf30e8899cb0379e14eba26c6aa00b7f SHA256 a07e1dd5932d91789f481394b318cf20f4c5a529168b8e5adb299736a643b94b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9SUsYACgkQYpJnKVbCxczy1gD+I436IBfWA7joSRjdZBpsCSE1
-rTzmUh6MKcMx/T4ldYUA/ApwePUAYL5WrL8t90TEIsRTGozggW8fN4W+gAS0fqHY
-=HW4N
+iEYEARECAAYFAk9XlqgACgkQcaHudmEf86raPQCfbdIEc+n4tLCpFwCnIEoPPmjT
+5q8AnRlLIlou786ih2tWsDxKwu6GCxAE
+=pMtP
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch b/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch
new file mode 100644
index 000000000000..9ad232a778be
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch
@@ -0,0 +1,66 @@
+commit 5bc62e01cd22ea1f56bde94b0616c46f8af2676e
+Author: Gerd Hoffmann <kraxel@redhat.com>
+Date:   Wed Feb 8 13:54:13 2012 +0100
+
+    build: allow turning off debuginfo
+    
+    This patch adds --{enable,disable}-debug-info switches to configure
+    which allows to include/exclude the '-g' switch on the gcc & ld
+    command lines.  Not building debug info reduces ressource usage
+    (especially disk) alot and is quite useful for test builds.
+    
+    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
+
+diff --git a/configure b/configure
+index a1f4a6b..b22fcda 100755
+--- a/configure
++++ b/configure
+@@ -98,6 +98,7 @@ audio_pt_int=""
+ audio_win_int=""
+ cc_i386=i386-pc-linux-gnu-gcc
+ libs_qga=""
++debug_info="yes"
+ 
+ target_list=""
+ 
+@@ -207,6 +208,10 @@ for opt do
+   ;;
+   --extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS"
+   ;;
++  --enable-debug-info) debug_info="yes"
++  ;;
++  --disable-debug-info) debug_info="no"
++  ;;
+   --sparc_cpu=*)
+     sparc_cpu="$optarg"
+     case $sparc_cpu in
+@@ -244,13 +249,15 @@ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
+ 
+ # default flags for all hosts
+ QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
+-CFLAGS="-g $CFLAGS"
+ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
+ QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
+ QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
+ QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
+ QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
+-LDFLAGS="-g $LDFLAGS"
++if test "$debug_info" = "yes"; then
++    CFLAGS="-g $CFLAGS"
++    LDFLAGS="-g $LDFLAGS"
++fi
+ 
+ # make source path absolute
+ source_path=`cd "$source_path"; pwd`
+@@ -545,6 +552,10 @@ for opt do
+   ;;
+   --extra-ldflags=*)
+   ;;
++  --enable-debug-info)
++  ;;
++  --disable-debug-info)
++  ;;
+   --cpu=*)
+   ;;
+   --target-list=*) target_list="$optarg"
diff --git a/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch b/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch
new file mode 100644
index 000000000000..df8aacbc4f36
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch
@@ -0,0 +1,24 @@
+commit 8c84cf11660322489f839bc29db79bad31b4ecde
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Tue Jan 24 20:42:40 2012 +0300
+
+    ./configure: export xfs config via --{enable, disable}-xfsctl
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
+
+diff --git a/configure b/configure
+index 9d5175b..69fb239 100755
+--- a/configure
++++ b/configure
+@@ -766,6 +766,10 @@ for opt do
+   ;;
+   --enable-rbd) rbd="yes"
+   ;;
++  --disable-xfsctl) xfs="no"
++  ;;
++  --enable-xfsctl) xfs="yes"
++  ;;
+   --disable-smartcard) smartcard="no"
+   ;;
+   --enable-smartcard) smartcard="yes"
diff --git a/app-emulation/qemu/qemu-1.0.1.ebuild b/app-emulation/qemu/qemu-1.0.1.ebuild
index ebbca3388d9f..b7265fa2a4da 100644
--- a/app-emulation/qemu/qemu-1.0.1.ebuild
+++ b/app-emulation/qemu/qemu-1.0.1.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-1.0.1.ebuild,v 1.1 2012/03/03 17:19:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0.1.ebuild,v 1.2 2012/03/07 17:10:57 slyfox Exp $
 
 EAPI=4
 
@@ -135,6 +135,9 @@ src_prepare() {
 	EPATCH_EXCLUDE="0033-PPC-Fix-linker-scripts-on-ppc-hosts.patch" \
 	EPATCH_FORCE="yes" epatch
 
+	epatch "${FILESDIR}"/${PN}-1.0-unmagic-debug.patch
+	epatch "${FILESDIR}"/${PN}-1.0-unmagic-xfsctl.patch
+
 	# prevent docs to get automatically installed
 	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die