Fix gcc 4.3 compile failure, part of #259670

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 40 insertions, 15 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 88b2fed7d3e4..7695fff8a607 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.57 2009/02/28 10:19:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.58 2009/04/26 13:02:31 patrick Exp $
+
+  26 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/xen-3.3.0-warning-fix.patch, xen-3.3.0:
+  Fix gcc 4.3 compile failure, part of #259670
 
   28 Feb 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
   custom-cflags is a global USE-flag
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 3821a4ea79f1..38338d1e2d96 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xen-3.3.0-warning-fix.patch 968 RMD160 7834653a79cece5fe6c891a9fa60999d3017d53d SHA1 7dc792eace2fb3fdeccce4b3d791701a92095592 SHA256 1072d031b2bc4b217f4c2b4795d30cd81d592c1838ea6b399f2e62f0077e15f3
 AUX xen-sed-gcc.patch 1026 RMD160 ddb00f6a04cb791fd895ca0221987df624fe8a35 SHA1 602f9779f56c3a9f0a97f458a6d3eec2740440ef SHA256 7b6d10a51aa56991b1624252edf7842f6e7883a0b0f0e77edf0414f57cc390b0
 DIST xen-3.1.3.tar.bz2 5852287 RMD160 df36208c8e709c61f2b4a74d18d2e81531ab4721 SHA1 5542d2bd07afaf80d70c85f7b75c6e6b432be08b SHA256 b94ab7a07269848dec8904625f348405c4af4ac7b579a402b2d830503ecd53a1
 DIST xen-3.2.1.tar.gz 6356315 RMD160 9ddda1185e6a19a6ccd73f5dde15640d2e31b125 SHA1 753f3d79d7ae2175e78b261765a9935db6255996 SHA256 dc3c057acab2173330db88d1f1d0587caf5717a4a882b93694a1bc90c71ad12a
 DIST xen-3.3.0.tar.gz 11338614 RMD160 c98c08617e302ef4004d17cb0ba161d0ed7af59c SHA1 b6365864eeb5125e0f66a056c4c72816e1789358 SHA256 89f5880b638b1149b042ab0b54f6a652085da0d05ac980ba611a617cc3a8f06d
 EBUILD xen-3.1.3.ebuild 2543 RMD160 d0f4eb913ebd5e9721698ad9c6f3baec75cb8372 SHA1 94fac9d73c522205c04ae37d500d7dc326317959 SHA256 dad9c783e17507e9461347add4529100c82ca331025d7485c4ca55527fc3ceb7
 EBUILD xen-3.2.1.ebuild 2565 RMD160 2a2829c2552c0df03834eaaf120a796fc3d22bf3 SHA1 82c5d1189e95edbb1d6085add13a3e05e7b8028c SHA256 8892ac5ff60d04b328794712568b7cbee543fb2aae332b465496eedd1388f844
-EBUILD xen-3.3.0.ebuild 2914 RMD160 119d7e82cc51b22c7eb297647ac06f7375ce32f4 SHA1 396e92a3d0431e9ddc6d1b7b383413b14b523df0 SHA256 00a9402d82e692ac571aeaccefc79ad8738171e54b504f9f0ea57ff3c80ce48f
-MISC ChangeLog 9448 RMD160 c2b3b7a8f8d947d2a7d84aca776ab0274bfee9dd SHA1 8cf9cd76846253ddae1d260ea74ef15c0e3fd31f SHA256 944d4803078f1a76d385864e9d0d8128bd3704d1c16644254e281f060af16577
+EBUILD xen-3.3.0.ebuild 3002 RMD160 64dcf0ba6f403954d6d47469163e27328bca1e3b SHA1 7e4c8b72eca436c31354192f82160937549568a3 SHA256 2bbb9db5ee93eb3bde0630dfc7cb1c96a00a0b3f71c1f6c11d20cceb9d1e0557
+MISC ChangeLog 9596 RMD160 d6fda6791a5ab0ab2850f07a94ef2989d5cb598f SHA1 956e0b3735cad8122ee246fbb3203487045eed85 SHA256 7eecdfeb6db8429e2ce09c6d6b304b8de23662b8e0f665a0c8f3e890d06635bd
 MISC metadata.xml 454 RMD160 669ebed46522166118d55bf6f6917b5902a8edb4 SHA1 76bc8f2ae3abb50dbf778d8051fcf797b19b092c SHA256 383ef9830d024c489d6edec8c78bf391821c7f1076c6b56d6e1dd2a754754279
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmpD+wACgkQkKaRLQcq0GI93wCfWVpXDZ9tkYqO/F2X59s55JFJ
-EFgAoLWtPgUkjEI9jXfxS6y4KYRewvZH
-=rnWh
------END PGP SIGNATURE-----
diff --git a/app-emulation/xen/files/xen-3.3.0-warning-fix.patch b/app-emulation/xen/files/xen-3.3.0-warning-fix.patch
new file mode 100644
index 000000000000..d1cc78c322bc
--- /dev/null
+++ b/app-emulation/xen/files/xen-3.3.0-warning-fix.patch
@@ -0,0 +1,26 @@
+diff -Nru a/xen/drivers/char/console.c b/xen/drivers/char/console.c
+--- a/xen/drivers/char/console.c	2008-08-22 17:49:09.000000000 +0800
++++ b/xen/drivers/char/console.c	2009-02-19 18:39:47.000000000 +0800
+@@ -919,7 +919,7 @@
+     console_start_sync();
+     printk("\n****************************************\n");
+     printk("Panic on CPU %d:\n", smp_processor_id());
+-    printk(buf);
++    printk("%s", buf);
+     printk("****************************************\n\n");
+     if ( opt_noreboot )
+         printk("Manual reset required ('noreboot' specified)\n");
+diff -Nru a/xen/tools/symbols.c b/xen/tools/symbols.c
+--- a/xen/tools/symbols.c	2008-08-22 17:49:10.000000000 +0800
++++ b/xen/tools/symbols.c	2009-02-19 18:36:35.000000000 +0800
+@@ -80,8 +80,9 @@
+ 	rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str);
+ 	if (rc != 3) {
+ 		if (rc != EOF) {
++			char* z;
+ 			/* skip line */
+-			fgets(str, 500, in);
++			z = fgets(str, 500, in);
+ 		}
+ 		return -1;
+ 	}
diff --git a/app-emulation/xen/xen-3.3.0.ebuild b/app-emulation/xen/xen-3.3.0.ebuild
index 6b76ff98aa1b..4f9ffbb249c7 100644
--- a/app-emulation/xen/xen-3.3.0.ebuild
+++ b/app-emulation/xen/xen-3.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.3.0.ebuild,v 1.1 2008/09/01 00:30:53 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.3.0.ebuild,v 1.2 2009/04/26 13:02:31 patrick Exp $
 
 inherit mount-boot flag-o-matic toolchain-funcs
 
@@ -54,6 +54,10 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-sed-gcc.patch
 
+	# Fix compiler warning on gcc 4.3.3
+	epatch "${FILESDIR}/${P}-warning-fix.patch"
+
+
 	# if the user *really* wants to use their own custom-cflags, let them
 	if use custom-cflags; then
 		einfo "User wants their own CFLAGS - removing defaults"