added a patch to always use -fPIC for the shared library test, otherwise it may fail on -fPIC dependant archs. fixes bug #61868

4 files changed, 27 insertions, 4 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index d44a1d802703..f7ffb51de68e 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.36 2004/08/27 04:57:37 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.37 2004/08/29 03:07:07 lv Exp $
+
+  28 Aug 2004; Travis Tilley <lv@gentoo.org> +files/zlib-1.2.1-fPIC.patch,
+  zlib-1.2.1-r3.ebuild:
+  added a patch to always use -fPIC for the shared library test, otherwise it
+  may fail on -fPIC dependant archs. fixes bug #61868
 
   27 Aug 2004; Travis Tilley <lv@gentoo.org> zlib-1.2.1-r3.ebuild:
   moved CONF_LIBDIR logic to use $(get_libdir) instead so that the ebuild will
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index f56bb1da2d9a..ab9f3a1e16fd 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -4,8 +4,8 @@ MD5 ae016cf235049588d41c1797c8e94638 zlib-1.1.4-r4.ebuild 1311
 MD5 685811c05eac951acc75ceccf8b4d992 zlib-1.2.1.ebuild 1264
 MD5 9b68e47c58d78250f1b610cb714fefa7 zlib-1.2.1-r1.ebuild 1309
 MD5 eba713fa0b9e1cfd9b6399bb41719492 zlib-1.1.4-r3.ebuild 1229
-MD5 d90fb61ad477289ef8b45327a8583bf3 zlib-1.2.1-r3.ebuild 1842
-MD5 a0097641ec31164c88d30b4423fb976a ChangeLog 5411
+MD5 33f8a662fc8ce2bf4dee9ba04e7d9059 zlib-1.2.1-r3.ebuild 1937
+MD5 a1a92db0976a788b55f936bcb75ff2a5 ChangeLog 5643
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a99957dc7ed74f72f833af10fd786352 files/zlib-1.1.4-build-fPIC.patch 2157
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1 63
@@ -22,5 +22,6 @@ MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r2 63
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r3 63
 MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
 MD5 72490e2d8f00f11cd3d70f8352b2c9ad files/zlib-1.1.4-glibc.patch 323
+MD5 a337d1727a4f6f9ed8d29e43cde40e89 files/zlib-1.2.1-fPIC.patch 662
 MD5 9cdacd156a2ba9dff840c9ce7d8433db files/zlib-1.2.1-CAN-2004-0797.patch 786
 MD5 9c2321cdb61e2d58b41a0d61a98d293b files/zlib-1.2.1-build-fPIC.patch 2252
diff --git a/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch b/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch
new file mode 100644
index 000000000000..a9be0c1b042d
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch
@@ -0,0 +1,15 @@
+--- zlib-1.2.1.old/configure	2004-08-28 08:19:49.000000000 -0400
++++ zlib-1.2.1/configure	2004-08-28 08:33:57.745864064 -0400
+@@ -73,7 +73,11 @@
+ 
+ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
+   CC="$cc"
+-  SFLAGS=${CFLAGS-"-fPIC -O3"}
++  #SFLAGS=${CFLAGS-"-fPIC -O3"}
++  # the above is horribly wrong on a few archs where -fPIC should ALWAYS be
++  # used in the creation of shared libraries. without the following, the
++  # shared lib test will sometimes fail even when shared libs -can- be created.
++  SFLAGS="${CFLAGS-"-O3"} -fPIC"
+   CFLAGS="$cflags"
+   case `(uname -s || echo unknown) 2>/dev/null` in
+   Linux | linux | GNU | GNU/*)
diff --git a/sys-libs/zlib/zlib-1.2.1-r3.ebuild b/sys-libs/zlib/zlib-1.2.1-r3.ebuild
index db418d8d0dfc..a43f5348b834 100644
--- a/sys-libs/zlib/zlib-1.2.1-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.9 2004/08/27 04:57:37 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.10 2004/08/29 03:07:07 lv Exp $
 
 inherit eutils flag-o-matic
 
@@ -29,6 +29,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-configure.patch
 	#security fix. bug #61749
 	epatch ${FILESDIR}/${P}-CAN-2004-0797.patch
+	# fix shared library test on -fPIC dependant archs
+	epatch ${FILESDIR}/zlib-1.2.1-fPIC.patch
 }
 
 src_compile() {