summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-06 13:17:36 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-06 13:17:36 +0000
commitbf7c9a746d528c37ea1110348fcc3b2daaa775dd (patch)
treee802ac88713058892ab7a3f64544a172484ac817 /sys-libs
parentchanged path/link for a better work with vdr-image plugin (diff)
downloadhistorical-bf7c9a746d528c37ea1110348fcc3b2daaa775dd.tar.gz
historical-bf7c9a746d528c37ea1110348fcc3b2daaa775dd.tar.bz2
historical-bf7c9a746d528c37ea1110348fcc3b2daaa775dd.zip
Don't try to execute -fPIC, append that afterward to make NetBSD work _and_ PIC being used, or it will build only static libraries on PIC arches.
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/zlib/ChangeLog7
-rw-r--r--sys-libs/zlib/Manifest18
-rw-r--r--sys-libs/zlib/files/zlib-1.2.1-fPIC.patch5
3 files changed, 18 insertions, 12 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index d26ac489eeff..3c345df85a72 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/zlib
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.56 2006/02/21 23:55:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.57 2006/03/06 13:17:36 flameeyes Exp $
+
+ 06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+ files/zlib-1.2.1-fPIC.patch:
+ Don't try to execute -fPIC, append that afterward to make NetBSD work _and_
+ PIC being used, or it will build only static libraries on PIC arches.
21 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+files/zlib-1.2.3-bsd-soname.patch, zlib-1.2.3.ebuild:
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index e0ba3b6ab62d..ce27f8b4b458 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,9 +1,9 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 5febe3ef48bc55a7ad3af76f46294b93 ChangeLog 7902
-RMD160 461bae46a907d9472801ed18d8c89f215eb43f62 ChangeLog 7902
-SHA256 9b011f2a6b084ce34253b403788d293f20c66aa37109aaedd6307c95b9dab248 ChangeLog 7902
+MD5 2b69d6ca8cbe37bae0d10b5f36a1e22d ChangeLog 8140
+RMD160 518131854f8f97f80bb3583fe9e7a7c69d6024bb ChangeLog 8140
+SHA256 5b8f900572a81d05406f61bb2eab9d4c3fac979ea99d04525ef84e26b506baad ChangeLog 8140
MD5 8040cf924143b9328aa2d584222e0f51 files/digest-zlib-1.2.3 63
RMD160 515fb7d5eee65e627fdb6d7b691e64dacdac3d19 files/digest-zlib-1.2.3 63
SHA256 54adede70a500f2de5da32dbca0821b4c236e44b14a509f732243ce3e9d4a073 files/digest-zlib-1.2.3 63
@@ -13,9 +13,9 @@ SHA256 c02fce932ea57fc417a51f5f0676abdcecc890e67a3c3cda510c0c151e2be88b files/zl
MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
RMD160 45a6e8fd83be0488bdf59f8965d394fc3be84246 files/zlib-1.2.1-configure.patch 3149
SHA256 ca0d5f7e50a90e6cafa554c85a9b19a8e2cbbb8c8f1de47fdd257ebfac4595aa files/zlib-1.2.1-configure.patch 3149
-MD5 248bd0a6b9b3be78a99e2a181671585d files/zlib-1.2.1-fPIC.patch 584
-RMD160 9f6895cb94a4c8980899c07fcf6bf13f4d119ecd files/zlib-1.2.1-fPIC.patch 584
-SHA256 586d4c965cc8894db0a3a06a64080a09d7018195caac1915805f8322a1d2f9eb files/zlib-1.2.1-fPIC.patch 584
+MD5 1b348be6edf9f2064173db3c1e4d4576 files/zlib-1.2.1-fPIC.patch 606
+RMD160 eb8e4fbedada15a325b17e880d2757060d541ab4 files/zlib-1.2.1-fPIC.patch 606
+SHA256 ee63a55b3bed9422f03add48002310d8074527bf5ce5a70a69022ea77a23d8d6 files/zlib-1.2.1-fPIC.patch 606
MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
RMD160 805b2a9f5f23445465cacc9c2c4af9b67ed7ed3e files/zlib-1.2.1-glibc.patch 395
SHA256 32711cf3faf25ff537c8a56be3ddcf1e4721de522c7966a3c5789e00d8fba0c7 files/zlib-1.2.1-glibc.patch 395
@@ -34,7 +34,7 @@ SHA256 8d977d340c3aeb16b637f874400bfb3d9790d1d25790a2f5c19fc033904be084 zlib-1.2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
-iD8DBQFECw9Y2+ySkm8kpY0RAuo0AJ4sF2WJ7UGzoWxH57D+reyEVjZt2wCgtuRm
-+pP7hAGFr8lGG/LDB+D0k6U=
-=Yg4/
+iD8DBQFEDDZZAiZjviIA2XgRAjZHAJoCuRuNTMnKaIpCgdpYZidN1yUj5QCfepW/
+K3TQjbYzQNQNHue8OBYJD+g=
+=pPln
-----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch b/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch
index 3a38ad924340..5ccbddfd0fbe 100644
--- a/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch
+++ b/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch
@@ -1,6 +1,6 @@
--- zlib-1.2.1/configure
+++ zlib-1.2.1/configure
-@@ -73,7 +73,11 @@
+@@ -73,7 +73,12 @@
if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
CC="$cc"
@@ -9,7 +9,8 @@
+ # 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
++ SFLAGS=${CFLAGS-"-O3"}
++ SFLAGS="${SFLAGS} -fPIC"
CFLAGS="$cflags"
case `(uname -s || echo unknown) 2>/dev/null` in
Linux | linux | GNU | GNU/*)