From: Mike Frysinger Date: Wed, 5 Jan 2005 01:53:39 +0000 (+0000) Subject: Add patch from upstream to clean up assert.h. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33a1e9a4099cc1ff87600ce97fe1c528ac0894f5;p=gentoo.git Add patch from upstream to clean up assert.h. --- diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 4fd916191b46..8cca8be928b6 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.299 2005/01/03 22:42:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.300 2005/01/05 01:53:39 vapier Exp $ + + 04 Jan 2005; Mike Frysinger + +files/2.3.2/glibc-2.3.2-assert.patch, glibc-2.3.2-r12.ebuild: + Add patch from upstream to clean up assert.h. 03 Jan 2005; Mike Frysinger +files/2.3.2/glibc-2.3.2-alpha-sysdeps.patch, glibc-2.3.2-r12.ebuild: diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 983b17a593e6..48496a8fd660 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 d512602b4649239240dd218de521fcbb ChangeLog 63481 -MD5 7cf88dee2671dcc30659d07241b8d918 glibc-2.2.5-r9.ebuild 10915 -MD5 3b8f20dc8c32936d31a2aac4f596caf4 glibc-2.3.2-r12.ebuild 21738 -MD5 d59fdfb3aca88476d792b71922c765a5 glibc-2.3.3.20040420-r2.ebuild 21630 -MD5 48dcbf88afd15efb62b4313337261968 glibc-2.3.4.20040619-r2.ebuild 21077 +MD5 ed4fb3223e1583dc9bbfcdc884454e47 ChangeLog 63645 +MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915 +MD5 3b44d39389334d36b42c51887729dd4d glibc-2.3.2-r12.ebuild 21817 +MD5 39ac6b0f30c9c27a5cd04c4e0b6caadb glibc-2.3.3.20040420-r2.ebuild 21634 +MD5 e4c399efc30efc54fb478b897cd37149 glibc-2.3.4.20040619-r2.ebuild 21078 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -MD5 b4bbaaf21fccef026c3e8657457e56c9 glibc-2.3.4.20040808-r1.ebuild 25121 -MD5 1872a60b491f3f1cba81313f5ddb67b8 glibc-2.3.4.20041102.ebuild 29740 +MD5 663dd1ec49f1494962ccb7e980aec5ac glibc-2.3.4.20040808-r1.ebuild 25117 +MD5 ba454b14b54067f0ffa7de7bc6941cb4 glibc-2.3.4.20041102.ebuild 29737 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312 @@ -93,6 +93,7 @@ MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.2/glibc-2.3.2-signal-ssp.diff 143 MD5 0e3ced9c3c484f502dcade7ffffa15f4 files/2.3.2/ssp.c 3935 MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443 MD5 d7097bf7fe910f2cba6ec69f86eb1958 files/2.3.2/glibc-2.3.2-alpha-sysdeps.patch 939 +MD5 fa3bf332c71b0b5af56b536564abc480 files/2.3.2/glibc-2.3.2-assert.patch 1596 MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986 MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791 MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770 @@ -138,7 +139,7 @@ MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFB2cplroRuSHgZdywRAucMAJ4jE1ed6NvDyN591VNH6Gn4Xk/4AwCeP5GP -j3RUqI4G/TvhqjSy7cr8uSg= -=KNe4 +iD8DBQFB20itroRuSHgZdywRAoUAAJsEfYCxh8+3cdmZOAZwXWVMfnxEdQCfUtCK +JKskttyZOiTNfkw+I0NU670= +=GhjB -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-assert.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-assert.patch new file mode 100644 index 000000000000..e779e99b1753 --- /dev/null +++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-assert.patch @@ -0,0 +1,44 @@ +Index: assert/assert.h +=================================================================== +RCS file: /cvs/glibc/libc/assert/assert.h,v +retrieving revision 1.25 +retrieving revision 1.26 +diff -u -r1.25 -r1.26 +--- assert/assert.h 15 Aug 2003 17:54:31 -0000 1.25 ++++ assert/assert.h 4 Oct 2004 07:45:23 -0000 1.26 +@@ -84,33 +84,16 @@ + + __END_DECLS + +-/* For the macro definition we use gcc's __builtin_expect if possible +- to generate good code for the non-error case. gcc 3.0 is a good +- enough estimate for when the feature became available. */ +-# if __GNUC_PREREQ (3, 0) +-# define assert(expr) \ +- (__ASSERT_VOID_CAST (__builtin_expect (!!(expr), 1) ? 0 : \ +- (__assert_fail (__STRING(expr), __FILE__, __LINE__, \ +- __ASSERT_FUNCTION), 0))) +-# else +-# define assert(expr) \ ++# define assert(expr) \ + (__ASSERT_VOID_CAST ((expr) ? 0 : \ + (__assert_fail (__STRING(expr), __FILE__, __LINE__, \ + __ASSERT_FUNCTION), 0))) +-# endif + + # ifdef __USE_GNU +-# if __GNUC_PREREQ (3, 0) +-# define assert_perror(errnum) \ +- (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 : \ +- (__assert_perror_fail ((errnum), __FILE__, __LINE__, \ +- __ASSERT_FUNCTION), 0))) +-# else +-# define assert_perror(errnum) \ ++# define assert_perror(errnum) \ + (__ASSERT_VOID_CAST (!(errnum) ? 0 : \ + (__assert_perror_fail ((errnum), __FILE__, __LINE__, \ + __ASSERT_FUNCTION), 0))) +-# endif + # endif + + /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__' diff --git a/sys-libs/glibc/glibc-2.2.5-r9.ebuild b/sys-libs/glibc/glibc-2.2.5-r9.ebuild index 56450db51f58..b0151af6fdbc 100644 --- a/sys-libs/glibc/glibc-2.2.5-r9.ebuild +++ b/sys-libs/glibc/glibc-2.2.5-r9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r9.ebuild,v 1.13 2004/09/29 05:24:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r9.ebuild,v 1.14 2005/01/05 01:53:39 vapier Exp $ inherit flag-o-matic gcc eutils diff --git a/sys-libs/glibc/glibc-2.3.2-r12.ebuild b/sys-libs/glibc/glibc-2.3.2-r12.ebuild index 934aa13a2eac..7f06574ccf50 100644 --- a/sys-libs/glibc/glibc-2.3.2-r12.ebuild +++ b/sys-libs/glibc/glibc-2.3.2-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.4 2005/01/03 22:42:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.5 2005/01/05 01:53:39 vapier Exp $ inherit eutils flag-o-matic gcc @@ -328,6 +328,9 @@ src_unpack() { # PT_GNU_STACK section. Bug #32960. (12 Nov 2003). epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-dl_execstack-PaX-support.patch + # Upstream patch to fix assert.h + epatch ${FILESDIR}/2.3.2/${P}-assert.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 diff --git a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild index b005fd95c7ff..0a21f5daa5a0 100644 --- a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.3 2004/11/11 02:29:50 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.4 2005/01/05 01:53:39 vapier Exp $ inherit eutils flag-o-matic gcc diff --git a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild index 16b5dcd9958a..0eb66c52ebe1 100644 --- a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.4 2004/11/12 23:43:37 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.5 2005/01/05 01:53:39 vapier Exp $ inherit eutils flag-o-matic gcc diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild index 124994a34dd6..25f7b7e92f8e 100644 --- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.23 2004/12/23 20:16:59 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.24 2005/01/05 01:53:39 vapier Exp $ inherit eutils flag-o-matic gcc versionator diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild index 14cbc9b73908..f2f649dc8642 100644 --- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.17 2004/12/28 11:32:58 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.18 2005/01/05 01:53:39 vapier Exp $ inherit eutils flag-o-matic gcc versionator