Add fix from upstream for USE=-pic building on x86 #309079.

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

4 files changed, 72 insertions, 9 deletions

diff --git a/app-arch/gzip/ChangeLog b/app-arch/gzip/ChangeLog
index 75ff58037bd1..e91e79f1f0ba 100644
--- a/app-arch/gzip/ChangeLog
+++ b/app-arch/gzip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/gzip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.108 2010/02/11 19:19:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.109 2010/07/31 17:32:58 vapier Exp $
+
+  31 Jul 2010; Mike Frysinger <vapier@gentoo.org> gzip-1.4.ebuild,
+  +files/gzip-1.4-assembler.patch:
+  Add fix from upstream for USE=-pic building on x86 #309079.
 
   11 Feb 2010; Raúl Porcel <armin76@gentoo.org> gzip-1.4.ebuild:
   alpha/ia64/m68k/s390/sh stable wrt #300943
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index b032a1ed81e0..620741a37ff3 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,10 +1,16 @@
-AUX gnulib-futimens-rename.patch 1323 RMD160 79f1bcd78441aa4bef1975ee68011cd5d68b7bf1 SHA1 f030ebc2f34f8b2ef59112e2f28f8eabeeb9f4fc SHA256 12d3ccbe88aef4f7218799d961e1fc4f56609c59bd739cfc6e3965838e6893a1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gzip-1.3.8-install-symlinks.patch 280 RMD160 31a85a5adbc91fd664f3c5f3635483b5b39a6f0e SHA1 4019708174e1cf3b80df3413c478148d10e9d8c2 SHA256 f8b8c8548ae32975ba8e5bbc79add0f951954e1b4a21de55575274de177925d1
-DIST gzip-1.3.12.tar.gz 462169 RMD160 857172d207d87abe5fb52f6e7dd0474a421b0d79 SHA1 264e82876f201d9576626fbb1e0e9fe458efe9b9 SHA256 3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af
-DIST gzip-1.3.14.tar.gz 844214 RMD160 f4c35d6867fe258d6b61d2ceff8d1d9a4c1358f1 SHA1 9708a822a4f62b290572017da701c6795410dbdb SHA256 1ba4990536ba667e1c14af58bdd4942cb2c81bcce5c0e03503cc84cc6cb9a163
+AUX gzip-1.4-assembler.patch 1703 RMD160 807f1428cdf9342f912422ce0b0afec628d0ec6b SHA1 16311f87fb8e13881b04a38447ee7e820f000731 SHA256 4d05f0c6df2fcca0dcc6f72f4545ea89e0cdcb92d1f6b9e9e2bd1942da46cf81
 DIST gzip-1.4.tar.gz 907411 RMD160 a74f782960387e3f05373acc258becb564eda82d SHA1 1d398dac6a7920a7de6e2685fe472a840eb2ce6e SHA256 d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee
-EBUILD gzip-1.3.12-r1.ebuild 1400 RMD160 a9ff029c48527345765be98b2623c9a7beb49a14 SHA1 00e2ebffcf6b1bc57df987f6ed5ff5c6baae4493 SHA256 56e3df4c0406c3348d5568ac24bad70c7ab161170ab4e92c2aab861bb5d58560
-EBUILD gzip-1.3.14.ebuild 1295 RMD160 0600d8458657cd42be6e923aaf161ab11125ea8d SHA1 f4c5c6ecabe7ca865a632c9c47d8da02db29e46a SHA256 3fee74fac16d52827bab2dcdc2728c22620713b3bc7d04353edc1bfb6de6fc50
-EBUILD gzip-1.4.ebuild 1281 RMD160 181180270bc8db3fc4215bae83c96a039faa17cb SHA1 bc0f09edf83a0c54698a131a5950e3f05a0954be SHA256 d748e2fffef9d7dad442e5f73444f802b56b4d71f1a1b6c198eb277d140eccaa
-MISC ChangeLog 15625 RMD160 0838a69c16d3c34e27ca138177cca5e84e583052 SHA1 2528b2d8e98024fde55852ac60d98c863450e809 SHA256 837bd7b19fef6d762d42e24348809ad52201be9597258fd764ccd37346fc6187
+EBUILD gzip-1.4.ebuild 1331 RMD160 c5b61b5a59595e8888be4f627951cd2444f10385 SHA1 5708833d1ee5f3ce645d1e9e1b1874d6f3413cf3 SHA256 45005ac39be04f6372bf40865cd024bd17b00018de230c0587b84da4501f12aa
+MISC ChangeLog 15789 RMD160 45d98f5a84340fb93242ce498cd07226b7266baf SHA1 d364cbcabb91b537a80f1fdc0077930c6c61cb0e SHA256 6f5f9703818fe008cafddd7445aa63b6922d93c477a2ce62d303b3026f3fe011
 MISC metadata.xml 258 RMD160 fb52cbd38f7a8c9d7fee81f2db5dde7e3b17e045 SHA1 27fbcb42e87ac32af5f2a864ffc330b23b7b9f70 SHA256 3e8d2c98025402bd29168f46db0e4ed14ae2d64ee8e75508d87b136d06ba044c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkxUXkMACgkQTwhj9JtAlp4EKAD/XTzo25bWMiRbaSwrHepZJTKX
+gMQ9PO0gS4mTlpc8YL0A/1GPxFtEMnhqStRCa4mS6nFovGiG0NtLwzJW6cLhiyvW
+=gVCR
+-----END PGP SIGNATURE-----
diff --git a/app-arch/gzip/files/gzip-1.4-assembler.patch b/app-arch/gzip/files/gzip-1.4-assembler.patch
new file mode 100644
index 000000000000..76aade5c9341
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.4-assembler.patch
@@ -0,0 +1,52 @@
+http://bugs.gentoo.org/309079
+http://lists.gnu.org/archive/html/bug-gzip/2010-02/msg00032.html
+
+From 61af16213a488af3a8e994399ebd0859d390edb6 Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Sat, 20 Mar 2010 13:05:58 +0100
+Subject: [PATCH] use assembly code matcher when possible
+
+* configure.ac (ASCPPPOST): Backslash-escape "#" in AC_SUBST'd
+variable, to keep make from seeing it as a comment-introducer.
+Based on a patch by Petr Pisar.
+* lib/Makefile.am (match.$(OBJEXT)): Use AM_V_GEN and AM_V_at.
+* lib/match.c: Don't include <config.h>.
+It would impede configure-time assembler test.
+* .x-sc_require_config_h: Exempt lib/match.c from syntax-check.
+* .x-sc_require_config_h_first: Likewise.
+---
+ .x-sc_require_config_h       |    1 +
+ .x-sc_require_config_h_first |    1 +
+ THANKS                       |    1 +
+ configure.ac                 |    2 +-
+ lib/Makefile.am              |   12 ++++++------
+ lib/match.c                  |    2 --
+ 6 files changed, 10 insertions(+), 9 deletions(-)
+ create mode 100644 .x-sc_require_config_h
+ create mode 100644 .x-sc_require_config_h_first
+
+--- a/configure
++++ b/configure
+@@ -22588,5 +22588,5 @@
+ 
+ # cc -E produces incorrect asm files on SVR4, so postprocess it.
+-ASCPPPOST="sed '/^ *#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
++ASCPPPOST="sed '/^ *\\#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
+ 
+ 
+diff --git a/lib/match.c b/lib/match.c
+index 4ef6128..5dd8d64 100644
+--- a/lib/match.c
++++ b/lib/match.c
+@@ -28,8 +28,6 @@
+  * David Mosberger-Tang <davidm@hpl.hp.com>.
+  */
+ 
+-#include <config.h>
+-
+ /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
+  * external symbols with an underline character '_'.
+  */
+-- 
+1.7.1.1
+
diff --git a/app-arch/gzip/gzip-1.4.ebuild b/app-arch/gzip/gzip-1.4.ebuild
index 6507ad0778fc..88af81fd003f 100644
--- a/app-arch/gzip/gzip-1.4.ebuild
+++ b/app-arch/gzip/gzip-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.6 2010/02/11 19:19:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.7 2010/07/31 17:32:58 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,6 +25,7 @@ src_unpack() {
 	cd "${S}"
 	#epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch
 	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
+	epatch "${FILESDIR}"/${P}-assembler.patch #309079
 }
 
 src_compile() {