diff options
| author |   Michael McCabe <randy@gentoo.org> | 2004-04-18 16:24:33 +0000 |
|---|---|---|
| committer | Michael McCabe <randy@gentoo.org> | 2004-04-18 16:24:33 +0000 |
| commit | 586e4f2828482df4e04acfda36dcb878d69bcfc6 (patch) | |
| tree | 96b3d8fa55185f7d538da260590707ffa5e15e54 /sys-libs | |
| parent | Closing #48151. (Manifest recommit) (diff) | |
| download | gentoo-2-586e4f2828482df4e04acfda36dcb878d69bcfc6.tar.gz gentoo-2-586e4f2828482df4e04acfda36dcb878d69bcfc6.tar.bz2 gentoo-2-586e4f2828482df4e04acfda36dcb878d69bcfc6.zip | |
Added s390 specific fixes to close bug #47415
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 14 | ||||
| -rw-r--r-- | sys-libs/glibc/Manifest | 71 | ||||
| -rw-r--r-- | sys-libs/glibc/files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch | 149 | ||||
| -rw-r--r-- | sys-libs/glibc/files/digest-glibc-2.3.2-r10 | 4 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.2-r10.ebuild | 647 |
5 files changed, 850 insertions, 35 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 66096f370d6e..cb3ce32d338d 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for sys-libs/glibc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.141 2004/03/25 06:55:49 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.142 2004/04/18 16:24:33 randy Exp $ + +*glibc-2.3.2-r10 (18 Apr 2004) + + 18 Apr 2004; Michael McCabe <randy@gentoo.org> + +files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch, + +glibc-2.3.2-r10.ebuild: + Added s390 specific fixes to close bug #47415 + +*glibc-2.3.2-r10 18 Apr 2004 + + 18 Apr 2004; <> + # INSERT ENTRY HERE 24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> glibc-2.3.2-r2.ebuild, glibc-2.3.2-r3.ebuild, glibc-2.3.3_pre20031210.ebuild: diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index d7d975773160..9a2a804ae22c 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,3 +1,36 @@ +MD5 b8e29e1d1b014862863fe960900953fc ChangeLog 28495 +MD5 b141dc6e9c4183e869f6d95f0f015b99 glibc-2.2.5-r9.ebuild 10002 +MD5 c675fc65c82674fa5dedece6e8c82ffd glibc-2.3.1-r5.ebuild 10872 +MD5 2d68e9260ea54822015d849e930623df glibc-2.3.2-r2.ebuild 17924 +MD5 3ad8953f39f8ffd4d2039a866e10af5f glibc-2.3.2-r3.ebuild 17354 +MD5 710007bfa23141efc12c168e51a9dfa2 glibc-2.3.2-r9.ebuild 18611 +MD5 ffd10287df8992da037e5c4eae817b3d glibc-2.3.3_pre20031210.ebuild 18970 +MD5 6876fa6735e0bf7496c1a1e81875063b glibc-2.3.2-r10.ebuild 18902 +MD5 ddcc8af8d100e7638cd465c0508e7388 glibc-2.3.3_pre20040117-r1.ebuild 19187 +MD5 199699ee4b4f6c1029ad5c487a7318f8 glibc-2.3.3_pre20040117.ebuild 18481 +MD5 04c966289d59e96a3e5d5e3fb94dc838 glibc-2.3.3_pre20040207.ebuild 19549 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 +MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r5 141 +MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296 +MD5 6b4ab93e3890f58e0845bbe51923eeb1 files/digest-glibc-2.3.2-r3 205 +MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312 +MD5 b5f28bc50aafc5ed560d7eef910dbe8b files/digest-glibc-2.3.3_pre20031210 148 +MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r10 312 +MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117 312 +MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312 +MD5 4555143fbcd20978747f7864f2f7fc01 files/digest-glibc-2.3.3_pre20040207 312 +MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376 +MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320 +MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221 +MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610 +MD5 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755 +MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700 +MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612 +MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844 +MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158 +MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53 +MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210 @@ -17,24 +50,6 @@ MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.dif MD5 993732f56fdecf36f672198112fc5d5c files/2.2.5/glibc-2.2.5-threadsig.diff 636 MD5 a50da56218f9aabc347d7e1130961cec files/2.2.5/glibc-2.2.5.divbyzero.patch 1694 MD5 e9d9d086e8ed29ed49252d4cd0050f66 files/2.2.5/glibc-2.2.5.restrict_arr.patch 762 -MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 -MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r5 141 -MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296 -MD5 6b4ab93e3890f58e0845bbe51923eeb1 files/digest-glibc-2.3.2-r3 205 -MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117 312 -MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312 -MD5 4555143fbcd20978747f7864f2f7fc01 files/digest-glibc-2.3.3_pre20040207 312 -MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376 -MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320 -MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221 -MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610 -MD5 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755 -MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700 -MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612 -MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844 -MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158 -MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53 -MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54 MD5 21506827cc2094c80d3c0c0e8ef3569c files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 MD5 66d8b78875e17e2d385a4d52af9698c4 files/2.3.1/glibc-2.3.1-ctype-compat.patch 728 @@ -75,6 +90,7 @@ MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671 MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445 MD5 15ac94e1ccc48f31120960dfe006818a files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch 2262 +MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088 MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344 MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741 MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398 @@ -84,24 +100,11 @@ MD5 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-fun MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069 MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532 MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077 -MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443 MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153 -MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088 +MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443 +MD5 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638 MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791 MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff 1425 +MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752 MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470 MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431 -MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752 -MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312 -MD5 b5f28bc50aafc5ed560d7eef910dbe8b files/digest-glibc-2.3.3_pre20031210 148 -MD5 f3cc039e763042e87fc2e0e4f656fff5 ChangeLog 28422 -MD5 b141dc6e9c4183e869f6d95f0f015b99 glibc-2.2.5-r9.ebuild 10002 -MD5 2d68e9260ea54822015d849e930623df glibc-2.3.2-r2.ebuild 17924 -MD5 3ad8953f39f8ffd4d2039a866e10af5f glibc-2.3.2-r3.ebuild 17354 -MD5 199699ee4b4f6c1029ad5c487a7318f8 glibc-2.3.3_pre20040117.ebuild 18481 -MD5 c675fc65c82674fa5dedece6e8c82ffd glibc-2.3.1-r5.ebuild 10872 -MD5 04c966289d59e96a3e5d5e3fb94dc838 glibc-2.3.3_pre20040207.ebuild 19549 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 ddcc8af8d100e7638cd465c0508e7388 glibc-2.3.3_pre20040117-r1.ebuild 19187 -MD5 ffd10287df8992da037e5c4eae817b3d glibc-2.3.3_pre20031210.ebuild 18970 -MD5 710007bfa23141efc12c168e51a9dfa2 glibc-2.3.2-r9.ebuild 18611 diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch new file mode 100644 index 000000000000..a5acebe9edf2 --- /dev/null +++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch @@ -0,0 +1,149 @@ +From bug-glibc-bounces+listarch-bug-glibc=sources dot redhat dot com at gnu dot org Tue Aug 05 19:52:26 2003 +Return-Path: <bug-glibc-bounces+listarch-bug-glibc=sources dot redhat dot com at gnu dot org> +Delivered-To: listarch-bug-glibc at sources dot redhat dot com +Received: (qmail 31779 invoked from network); 5 Aug 2003 19:52:26 -0000 +Received: from unknown (HELO monty-python.gnu.org) (199.232.76.173) + by sources dot redhat dot com with SMTP; 5 Aug 2003 19:52:26 -0000 +Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) + by monty-python dot gnu dot org with esmtp (Exim 4 dot 20) + id 19k7hp-0004mC-J0 + for listarch-bug-glibc at sources dot redhat dot com; Tue, 05 Aug 2003 15:42:49 -0400 +Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) + id 19k7hd-0004lI-No + for bug-glibc at gnu dot org; Tue, 05 Aug 2003 15:42:37 -0400 +Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) + id 19k7h7-0004TP-8U + for bug-glibc at gnu dot org; Tue, 05 Aug 2003 15:42:36 -0400 +Received: from [32.97.182.102] (helo=e2.ny.us.ibm.com) + by monty-python dot gnu dot org with esmtp (Exim 4 dot 20) id 19k7h6-0004TH-V4 + for bug-glibc at gnu dot org; Tue, 05 Aug 2003 15:42:05 -0400 +Received: from northrelay02.pok.ibm.com (northrelay02.pok.ibm.com + [9 dot 56 dot 224 dot 150]) + by e2 dot ny dot us dot ibm dot com (8 dot 12 dot 9/8 dot 12 dot 2) with ESMTP id h75Jg3PS037034; + Tue, 5 Aug 2003 15:42:03 -0400 +Received: from D01ML249.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) + by northrelay02 dot pok dot ibm dot com (8 dot 12 dot 9/NCO/VER6 dot 5) with ESMTP id + h75Jg2vu131828; Tue, 5 Aug 2003 15:42:02 -0400 +Importance: Normal +MIME-Version: 1.0 +Sensitivity: +To: schwab at suse dot de, Ulrich Weigand <Ulrich dot Weigand at de dot ibm dot com> +X-Mailer: Lotus Notes Release 5.0.11 July 24, 2002 +From: William Jay Huie <wjhuie at us dot ibm dot com> +Message-ID: <OF3D561D81.1A9679A6-ON85256D79.00619378-85256D79.006DAF9F@us.ibm.com> +Date: Tue, 5 Aug 2003 15:41:56 -0400 +X-MIMETrack: Serialize by Router on D01ML249/01/M/IBM(Release 6.0.1 [IBM]|June + 10, 2003) at 08/05/2003 15:42:02, + Serialize complete at 08/05/2003 15:42:02 +Cc: bug-glibc at gnu dot org +Subject: fixed building gcc-2.3.2 on s390 +X-BeenThere: bug-glibc@gnu.org +X-Mailman-Version: 2.1.2 +Precedence: list +List-Id: Bug reports for the GNU standard C library <bug-glibc.gnu.org> +List-Archive: <http://mail.gnu.org/pipermail/bug-glibc> +List-Post: <mailto:bug-glibc at gnu dot org> +List-Help: <mailto:bug-glibc-request at gnu dot org?subject=help> +List-Subscribe: <http://mail dot gnu dot org/mailman/listinfo/bug-glibc>, + <mailto:bug-glibc-request at gnu dot org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============1920858710==" +Sender: bug-glibc-bounces+listarch-bug-glibc=sources dot redhat dot com at gnu dot org +Errors-To: bug-glibc-bounces+listarch-bug-glibc=sources.redhat.com@gnu.org + +This is a multipart message in MIME format. +--===============1920858710== +Content-Type: multipart/alternative; + boundary="=_alternative 006DAF4085256D79_=" + +This is a multipart message in MIME format. +--=_alternative 006DAF4085256D79_= +Content-Type: text/plain; charset="us-ascii" + +The problem was related to a file including an obsolete header file. + Checking /usr/include/sys/ustat.h shows the following comment; + + /* + * This interface is obsolete. Use <sys/statfs.h> +instead. + */ + + Changing the include in the offending file; + +osatest2:/usr/src/packages/SOURCES/glibc-2.3.2/sysdeps/unix/sysv/linux # +diff -u old.ustat.c ustat.c +--- old.ustat.c 2001-07-07 12:21:32.000000000 -0700 ++++ ustat.c 2003-08-05 11:24:20.000000000 -0700 +@@ -18,7 +18,7 @@ + 02111-1307 USA. */ + + #include <errno.h> +-#include <sys/ustat.h> ++#include <sys/statfs.h> + #include <sys/sysmacros.h> + + #include <sysdep.h> + + + Things then build correctly, + This is on a SLES-8 s390 31bit system using glibc levels 2.2.5-92. + j + +Jay Huie + wjhuie@us.ibm.com + zSeries Linux System Test + Phone: 845-435-8164 + +--=_alternative 006DAF4085256D79_= +Content-Type: text/html; charset="us-ascii" + + +<br><font size=2 face="sans-serif">The problem was related to a file including an obsolete header file.</font> +<br><font size=2 face="sans-serif"> Checking /usr/include/sys/ustat.h shows the following comment;</font> +<br> +<br><font size=2 face="sans-serif"> /*</font> +<br><font size=2 face="sans-serif"> * This interface is obsolete. Use <sys/statfs.h> instead.</font> +<br><font size=2 face="sans-serif"> */</font> +<br> +<br><font size=2 face="sans-serif"> Changing the include in the offending file;</font> +<br> +<br><font size=2 face="sans-serif">osatest2:/usr/src/packages/SOURCES/glibc-2.3.2/sysdeps/unix/sysv/linux # diff -u old.ustat.c ustat.c</font> +<br><font size=2 face="sans-serif">--- old.ustat.c 2001-07-07 12:21:32.000000000 -0700</font> +<br><font size=2 face="sans-serif">+++ ustat.c 2003-08-05 11:24:20.000000000 -0700</font> +<br><font size=2 face="sans-serif">@@ -18,7 +18,7 @@</font> +<br><font size=2 face="sans-serif"> 02111-1307 USA. */</font> +<br> +<br><font size=2 face="sans-serif"> #include <errno.h></font> +<br><font size=2 face="sans-serif">-#include <sys/ustat.h></font> +<br><font size=2 face="sans-serif">+#include <sys/statfs.h></font> +<br><font size=2 face="sans-serif"> #include <sys/sysmacros.h></font> +<br> +<br><font size=2 face="sans-serif"> #include <sysdep.h><br> +</font> +<br> +<br><font size=2 face="sans-serif"> Things then build correctly,</font> +<br><font size=2 face="sans-serif"> This is on a SLES-8 s390 31bit system using glibc levels 2.2.5-92.</font> +<br><font size=2 face="sans-serif"> j</font> +<br><font size=2 face="sans-serif"><br> +Jay Huie <br> + wjhuie@us.ibm.com<br> + zSeries Linux System Test<br> + Phone: 845-435-8164<br> +</font> +--=_alternative 006DAF4085256D79_=-- + + + +--===============1920858710== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +Bug-glibc mailing list +Bug-glibc@gnu.org +http://mail.gnu.org/mailman/listinfo/bug-glibc + +--===============1920858710==-- + + diff --git a/sys-libs/glibc/files/digest-glibc-2.3.2-r10 b/sys-libs/glibc/files/digest-glibc-2.3.2-r10 new file mode 100644 index 000000000000..07e3a8d0f559 --- /dev/null +++ b/sys-libs/glibc/files/digest-glibc-2.3.2-r10 @@ -0,0 +1,4 @@ +MD5 ede969aad568f48083e413384f20753c glibc-2.3.2.tar.bz2 13377170 +MD5 894b8969cfbdf787c73e139782167607 glibc-linuxthreads-2.3.2.tar.bz2 216310 +MD5 29fe849eca3e5aa2a2eb9e4055d93748 glibc-2.3.2-branch-update-20031115.patch.bz2 1692480 +MD5 c7c27c0821245d98a0568a475c08f4e9 glibc-2.3.2-hppa-patches-p1.tar.bz2 18793 diff --git a/sys-libs/glibc/glibc-2.3.2-r10.ebuild b/sys-libs/glibc/glibc-2.3.2-r10.ebuild new file mode 100644 index 000000000000..4d7cfa1f4078 --- /dev/null +++ b/sys-libs/glibc/glibc-2.3.2-r10.ebuild @@ -0,0 +1,647 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r10.ebuild,v 1.1 2004/04/18 16:24:33 randy Exp $ + +IUSE="nls pic build nptl" + +inherit eutils flag-o-matic gcc + +filter-flags "-fomit-frame-pointer -malign-double" +filter-ldflags "-pie" + +# Recently there has been a lot of stability problem in Gentoo-land. Many +# things can be the cause to this, but I believe that it is due to gcc3 +# still having issues with optimizations, or with it not filtering bad +# combinations (protecting the user maybe from himeself) yet. +# +# This can clearly be seen in large builds like glibc, where too aggressive +# CFLAGS cause the tests to fail miserbly. +# +# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion +# knows what he is talking about: +# +# People really shouldn't force code-specific options on... It's a +# bad idea. The -march options aren't just to look pretty. They enable +# options that are sensible (and include sse,mmx,3dnow when apropriate). +# +# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If +# you do not like it, comment it, but do not bugreport if you run into +# problems. +# +# <azarah@gentoo.org> (13 Oct 2002) +strip-flags + +# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here +export CFLAGS="${CFLAGS//-O?} -O2" +export CXXFLAGS="${CFLAGS}" +export LDFLAGS="${LDFLAGS//-Wl,--relax}" + +BRANCH_UPDATE="20031115" + +# Minimum kernel version for --enable-kernel +export MIN_KV="2.4.1" +# Minimum kernel version for enabling TLS and NPTL ... +# NOTE: do not change this if you do not know what +# you are doing ! +export MIN_NPTL_KV="2.6.0" + +MY_PV="${PV/_}" +S="${WORKDIR}/${P%_*}" +DESCRIPTION="GNU libc6 (also called glibc2) C library" +SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${MY_PV}.tar.bz2 + ftp://sources.redhat.com/pub/glibc/snapshots/glibc-${MY_PV}.tar.bz2 + http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${MY_PV}.tar.bz2 + ftp://sources.redhat.com/pub/glibc/snapshots/glibc-linuxthreads-${MY_PV}.tar.bz2 + mirror://gentoo/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2 + hppa? ( mirror://gentoo/${P}-hppa-patches-p1.tar.bz2 )" +HOMEPAGE="http://www.gnu.org/software/libc/libc.html" + +KEYWORDS="~x86 ~sparc ~amd64 ~hppa ~alpha ~ppc s390 ~ia64 ~mips" + +SLOT="2.2" +LICENSE="LGPL-2" + +# We need new cleanup attribute support from gcc for NPTL among things ... +DEPEND=">=sys-devel/gcc-3.2.3-r1 + x86? ( nptl? ( >=sys-devel/gcc-3.3.1-r1 ) ) + >=sys-devel/binutils-2.14.90.0.6-r1 + virtual/os-headers + nls? ( sys-devel/gettext )" +RDEPEND="virtual/os-headers + sys-apps/baselayout + nls? ( sys-devel/gettext )" + +PDEPEND="ppc? ( >=sys-kernel/linux-headers-2.4.22 )" + +PROVIDE="virtual/glibc" + + +# Try to get a kernel source tree with version equal or greater +# than $1. We basically just try a few default locations. The +# version need to be that which KV_to_int() returns ... +get_KHV() { + local headers= + + [ -z "$1" ] && return 1 + + # - First check if linux-headers are installed (or symlink + # to current kernel ...) + # - Ok, do we have access to the current kernel's headers ? + # - Last option ... maybe its a weird bootstrap with /lib + # binded to the chroot ... + + # We do not really support more than 2 arguments ... + if [ -n "$2" ] + then + headers="$2" + else + # We try to find the current kernel's headers first, + # as we would rather build against linux 2.5 headers ... + headers="/lib/modules/`uname -r`/build/include \ + ${ROOT}/lib/modules/`uname -r`/build/include \ + /usr/src/linux/include \ + ${ROOT}/usr/src/linux/include \ + ${ROOT}/usr/include" + fi + + for x in ${headers} + do + local header="${x}/linux/version.h" + + if [ -f ${header} ] + then + + local version="`grep 'LINUX_VERSION_CODE' ${header} | \ + sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`" + + if [ "${version}" -ge "$1" ] + then + echo "${x}" + + return 0 + fi + fi + done + + return 1 +} + +use_nptl() { + # Enable NPTL support if: + # - We have 'nptl' in USE + # - We have linux-2.5 or later kernel (should prob check for 2.4.20 ...) + if [ -n "`use nptl`" -a "`get_KV`" -ge "`KV_to_int ${MIN_NPTL_KV}`" ] + then + # Enable NPTL support if: + # - We have 'x86' in USE and: + # - a CHOST of "i486-pc-linux-gnu" + # - a CHOST of "i586-pc-linux-gnu" + # - a CHOST of "i686-pc-linux-gnu" + # - Or we have 'alpha' in USE + # - Or we have 'amd64' in USE + # - Or we have 'mips' in USE + # - Or we have 'ppc' in USE + case ${ARCH} in + "x86") + if [ "${CHOST/-*}" = "i486" -o \ + "${CHOST/-*}" = "i586" -o \ + "${CHOST/-*}" = "i686" ] + then + return 0 + fi + ;; + "alpha"|"amd64"|"mips"|"ppc"|"sparc") + return 0 + ;; + *) + return 1 + ;; + esac + fi + + return 1 +} + +pkg_setup() { + # We need gcc 3.2 or later ... + if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ] + then + echo + eerror "As of glibc-2.3, gcc-3.2 or later is needed" + eerror "for the build to succeed." + die "GCC too old" + fi + + echo + + if use_nptl + then + # The use_nptl should have already taken care of kernel version, + # arch and CHOST, so now just check if we can find suitable kernel + # source tree or headers .... + einfon "Checking for sufficient version kernel headers ... " + if ! get_KHV "`KV_to_int ${MIN_NPTL_KV}`" &> /dev/null + then + echo "no" + echo + eerror "Could not find a kernel source tree or headers with" + eerror "version ${MIN_NPTL_KV} or later! Please correct this" + eerror "and try again." + die "Insufficient kernel headers present!" + else + echo "yes" + fi + fi + + if [ "$(KV_to_int $(uname -r))" -gt "`KV_to_int '2.5.68'`" ] + then + local KERNEL_HEADERS="$(get_KHV "`KV_to_int ${MIN_NPTL_KV}`")" + + einfon "Checking kernel headers for broken sysctl.h ... " + if ! gcc -I"${KERNEL_HEADERS}" \ + -c ${FILESDIR}/test-sysctl_h.c -o ${T}/test1.o &> /dev/null + then + echo "yes" + echo + eerror "Your version of:" + echo + eerror " ${KERNEL_HEADERS}/linux/sysctl.h" + echo + eerror "is broken (from a user space perspective). Please apply" + eerror "the following patch:" + echo + eerror "*******************************************************" + cat ${FILESDIR}/fix-sysctl_h.patch + eerror "*******************************************************" + die "Broken linux/sysctl.h header included in kernel sources!" + else + echo "no" + fi + fi + + if use_nptl + then + einfon "Checking gcc for __thread support ... " + if ! gcc -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null + then + echo "no" + echo + eerror "Could not find a gcc that supports the __thread directive!" + eerror "please update to gcc-3.2.2-r1 or later, and try again." + die "No __thread support in gcc!" + else + echo "yes" + fi + + elif use nptl &> /dev/null + then + echo + # Just tell the user not to expect too much ... + ewarn "You have \"nptl\" in your USE, but your kernel version or" + ewarn "architecture does not support it!" + fi + + echo +} + +src_unpack() { + + unpack glibc-${MY_PV}.tar.bz2 + + # Extract pre-made man pages. Otherwise we need perl, which is a no-no. + mkdir -p ${S}/man; cd ${S}/man + use_nptl || tar xjf ${FILESDIR}/glibc-manpages-${MY_PV}.tar.bz2 + + cd ${S} + # Extract our threads package ... + if (! use_nptl) && [ -z "${BRANCH_UPDATE}" ] + then + unpack glibc-linuxthreads-${MY_PV}.tar.bz2 + fi + + if [ -n "${BRANCH_UPDATE}" ] + then + epatch ${DISTDIR}/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2 + fi + + if use_nptl + then + epatch ${FILESDIR}/2.3.2/${P}-redhat-nptl-fixes.patch + else + epatch ${FILESDIR}/2.3.2/${P}-redhat-linuxthreads-fixes.patch + fi + + # To circumvent problems with propolice __guard and + # __guard_setup__stack_smash_handler + # + # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml + if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" ] + then + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-propolice-guard-functions-v2.patch + fi + + # With latest versions of glibc, a lot of apps failed on a PaX enabled + # system with: + # + # cannot enable executable stack as shared object requires: Permission denied + # + # This is due to PaX 'exec-protecting' the stack, and ld.so then trying + # to make the stack executable due to some libraries not containing the + # PT_GNU_STACK section. Bug #32960. <azarah@gentoo.org> (12 Nov 2003). + epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-dl_execstack-PaX-support.patch + + # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files +# cd ${S}/io; epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch + + # This add back glibc 2.2 compadibility. See bug #8766 and #9586 for more info, + # and also: + # + # http://lists.debian.org/debian-glibc/2002/debian-glibc-200210/msg00093.html + # + # We should think about remoing it in the future after things have settled. + # + # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. + # + # <azarah@gentoo.org> (26 Oct 2002). + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-ctype-compat-v3.patch + + # One more compat issue which breaks sun-jdk-1.3.1. See bug #8766 for more + # info, and also: + # + # http://sources.redhat.com/ml/libc-alpha/2002-04/msg00143.html + # + # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. + # + # <azarah@gentoo.org> (30 Oct 2002). + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libc_wait-compat.patch + + # One more compat issue ... libc_stack_end is missing from ld.so. + # Got this one from diffing redhat glibc tarball .. would help if + # they used patches and not modified tarball ... + # + # <azarah@gentoo.org> (7 Nov 2002). +# cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-stack_end-compat.patch + + # The mathinline.h header omits the middle term of a ?: expression. This + # is a gcc extension, but since the ISO standard forbids it, it's a + # GLIBC bug (bug #27142). See also: + # + # http://bugs.gentoo.org/show_bug.cgi?id=27142 + # + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-fix-omitted-operand-in-mathinline_h.patch + + # We do not want name_insert() in iconvconfig.c to be defined inside + # write_output() as it causes issues with PaX. + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-iconvconfig-name_insert.patch + + # Fix broken reverse resolving for IPv6 addresses, bug #42492. + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-ipv6-bytestring-fix.patch + + # A few patches only for the MIPS platform. Descriptions of what they + # do can be found in the patch headers. + # <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003) + # <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches + if [ "${ARCH}" = "mips" ] + then + cd ${S} + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-fpu-cw-mips.patch + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libgcc-compat-mips.patch + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch + epatch ${FILESDIR}/2.3.2/${P}-mips-add-n32-n64-sysdep-cancel.patch + epatch ${FILESDIR}/2.3.2/${P}-mips-configure-for-n64-symver.patch + epatch ${FILESDIR}/2.3.2/${P}-mips-pread-linux2.5.patch + fi + + if [ "${ARCH}" = "alpha" ] + then + cd ${S} + # Fix compatability with compaq compilers by ifdef'ing out some + # 2.3.2 additions. + # <taviso@gentoo.org> (14 Jun 2003). + epatch ${FILESDIR}/2.3.2/${P}-decc-compaq.patch + + # Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis) + epatch ${FILESDIR}/2.3.2/${P}-alpha-pwrite.patch + epatch ${FILESDIR}/2.3.2/${P}-alpha-crti.patch + fi + + if [ "${ARCH}" = "amd64" ] + then + cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-amd64-nomultilib.patch + fi + + if [ "${ARCH}" = "ia64" ] + then + # The basically problem is glibc doesn't store information about + # what the kernel interface is so that it can't efficiently set up + # parameters for system calls. This patch from H.J. Lu fixes it: + # + # http://sources.redhat.com/ml/libc-alpha/2003-09/msg00165.html + # + cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-ia64-LOAD_ARGS-fixup.patch + fi + + if [ "${ARCH}" = "hppa" ] + then + cd ${WORKDIR} + unpack ${P}-hppa-patches-p1.tar.bz2 + cd ${S} + EPATCH_EXCLUDE="010* 020* 030* 040* 050* 055*" + for i in ${EPATCH_EXCLUDE} + do + rm -f ${WORKDIR}/${P}-hppa-patches/$i + done + for i in ${WORKDIR}/${P}-hppa-patches/* + do + einfo Applying `basename $i`... + patch -p1 < $i + done + einfo Applying glibc23-07-hppa-atomicity.dpatch... + patch -p 1 < ${FILESDIR}/2.3.1/glibc23-07-hppa-atomicity.dpatch + fi + + if ["${ARCH}" = "s390" ] + then + # The deprecated ustat.h causes problems on s390 + # + # http://sources.redhat.com/ml/bug-glibc/2003-08/msg00020.html + # + # Closes Bug 47415 + cd ${S}/sysdeps/unix/sysv/linux; epatch ${FILESDIR}/2.3.2/${P}-s390-deprecated-ustat-fixup.patch + fi + + # Fix permissions on some of the scripts + chmod u+x ${S}/scripts/*.sh +} + +setup_flags() { + # -freorder-blocks for all but ia64 s390 s390x + use ppc || append-flags "-freorder-blocks" + + # Sparc/Sparc64 support + if [ -n "`use sparc`" ] + then + + # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. + replace-flags "-fcall-used-g7" "" + append-flags "-fcall-used-g6" + + # Sparc64 Only support... + if [ "${PROFILE_ARCH}" = "sparc64" ] + then + + # Get rid of -mcpu options, the CHOST will fix this up + replace-flags "-mcpu=ultrasparc" "" + replace-flags "-mcpu=v9" "" + + # Get rid of flags known to fail + replace-flags "-mvis" "" + + # Setup the CHOST properly to insure "sparcv9" + # This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler + export CHOST="${CHOST/sparc/sparcv9}" + fi + fi +} + +src_compile() { + local myconf= + local myconf_nptl= + + setup_flags + + # These should not be set, else the + # zoneinfo do not always get installed ... + unset LANGUAGE LANG LC_ALL + + use nls || myconf="${myconf} --disable-nls" + + if use_nptl + then + local kernelheaders="$(get_KHV "`KV_to_int ${MIN_NPTL_KV}`")" + + # NTPL and Thread Local Storage support. + myconf="${myconf} --with-tls --with-__thread \ + --enable-add-ons=nptl \ + --enable-kernel=${MIN_NPTL_KV} \ + --with-headers=${kernelheaders}" + else + myconf="${myconf} --without-__thread \ + --enable-add-ons=linuxthreads" + + # If we build for the build system we use the kernel headers from the target + # We also now set it without "build" as well, else it might use the + # current kernel's headers, which might just fail (the linux-headers + # package is usually well tested...) +# ( use build || use sparc ) \ +# && myconf="${myconf} --with-headers=${ROOT}usr/include" + myconf="${myconf} --with-headers=${ROOT}usr/include" + + # If kernel version and headers in ${ROOT}/usr/include are ok, + # then enable --enable-kernel=${MIN_KV} ... + if [ "`get_KV`" -ge "`KV_to_int ${MIN_KV}`" -a \ + -n "$(get_KHV "`KV_to_int ${MIN_KV}`" "${ROOT}/usr/include")" ] + then + myconf="${myconf} --enable-kernel=${MIN_KV}" + else + myconf="${myconf} --enable-kernel=2.2.5" + fi + fi + + einfo "Configuring GLIBC..." + rm -rf ${S}/buildhere + mkdir -p ${S}/buildhere + cd ${S}/buildhere + ../configure --build=${CHOST} \ + --host=${CHOST} \ + --with-gd=no \ + --without-cvs \ + --disable-profile \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --libexecdir=/usr/lib/misc \ + ${myconf} || die + + einfo "Building GLIBC..." + cd ${S}/buildhere + make PARALLELMFLAGS="${MAKEOPTS}" || die +# einfo "Doing GLIBC checks..." +# make check +} + +src_install() { + local buildtarget="buildhere" + + setup_flags + + # These should not be set, else the + # zoneinfo do not always get installed ... + unset LANGUAGE LANG LC_ALL + + einfo "Installing GLIBC..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + install -C ${buildtarget} || die + + # If librt.so is a symlink, change it into linker script (Redhat) + if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ] + then + local LIBRTSO="`cd ${D}/lib; echo librt.so.*`" + local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`" + + rm -f ${D}/usr/lib/librt.so + cat > ${D}/usr/lib/librt.so <<EOF +/* GNU ld script + librt.so.1 needs libpthread.so.0 to come before libc.so.6* + in search scope. */ +EOF + grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so + echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \ + >> ${D}/usr/lib/librt.so + + for x in ${D}/usr/lib/librt.so.[1-9] + do + [ -L "${x}" ] && rm -f ${x} + done + fi + + if [ -z "`use build`" ] + then + einfo "Installing Info pages..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + info -C ${buildtarget} || die + + einfo "Installing Locale data..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + localedata/install-locales -C ${buildtarget} || die + + # Compatibility hack: this locale has vanished from glibc, + # but some other programs are still using it. + keepdir /usr/lib/locale/ru_RU/LC_MESSAGES + + einfo "Installing man pages and docs..." + # Install linuxthreads man pages + use_nptl || { + dodir /usr/share/man/man3 + doman ${S}/man/*.3thr + } + + # Install nscd config file + insinto /etc + doins ${FILESDIR}/nscd.conf + + dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \ + NEWS NOTES PROJECTS README* + else + rm -rf ${D}/usr/share ${D}/usr/lib/gconv + + einfo "Installing Timezone data..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + timezone/install-others -C ${buildtarget} || die + fi + + if [ "`use pic`" ] + then + find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \; + find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \; + find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \; + find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \; + for i in ${D}/lib/*.map + do + mv ${i} ${i%.map}_pic.map + done + fi + + # Is this next line actually needed or does the makefile get it right? + # It previously has 0755 perms which was killing things. + fperms 4755 /usr/lib/misc/pt_chown + + # Currently libraries in /usr/lib/gconv do not get loaded if not + # in search path ... +# insinto /etc/env.d +# doins ${FILESDIR}/03glibc + + rm -f ${D}/etc/ld.so.cache + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f ${D}/etc/localtime + + # Some things want this, notably ash. + dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a +} + +pkg_postinst() { + # Correct me if I am wrong here, but my /etc/localtime is a file + # created by zic .... + # I am thinking that it should only be recreated if no /etc/localtime + # exists, or if it is an invalid symlink. + # + # For invalid symlink: + # -f && -e will fail + # -L will succeed + # + if [ ! -e ${ROOT}/etc/localtime ] + then + echo "Please remember to set your timezone using the zic command." + rm -f ${ROOT}/etc/localtime + ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime + fi + + if [ -x ${ROOT}/usr/sbin/iconvconfig ] + then + # Generate fastloading iconv module configuration file. + ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} + fi + + # Reload init ... + if [ "${ROOT}" = "/" ] + then + /sbin/init U &> /dev/null + fi +} + |