diff options
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/glibc/Manifest | 12 | ||||
| -rw-r--r-- | sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 | 2 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild | 27 |
4 files changed, 35 insertions, 14 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index dba58addba65..f97595281098 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,12 @@ # 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.323 2005/03/05 23:45:05 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.324 2005/03/07 11:33:18 eradicator Exp $ + + 07 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> + glibc-2.3.4.20050125-r1.ebuild: + Don't allow sys/kd.h to prevent linux/types.h from loading outside of its + context. This fixes a problem with glibc, linux-headers-2.6 and bigendian + archs. 05 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.4.20050125-r1.ebuild: diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index bb0c051141a9..8ca87d81dace 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 18ecded3e45a90d8a686d685103feef0 ChangeLog 69108 +MD5 a75aa46fc0e8d26a7955517dfa046a40 ChangeLog 69361 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915 MD5 19b845756fd8e974c113e904396b9627 glibc-2.3.2-r12.ebuild 22153 MD5 1dee5d2dea67ffe479a0005cc7da35ce glibc-2.3.3.20040420-r2.ebuild 21626 @@ -11,7 +11,7 @@ MD5 ab06008394eb7c6aa17a674cae788eef glibc-2.3.4.20041102.ebuild 32888 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418 MD5 695f1e83d1cb212d83d97f0d2989cb94 glibc-2.3.4.20050125.ebuild 35240 -MD5 3cf9805c73f8d8b9e84ba1cbb31897d8 glibc-2.3.4.20050125-r1.ebuild 37188 +MD5 0144343e756ab9597669b7805db5a432 glibc-2.3.4.20050125-r1.ebuild 37646 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 @@ -33,7 +33,7 @@ MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54 MD5 5f2690b0a60b336ec8f26fa3a8898361 files/digest-glibc-2.3.4.20050125 371 MD5 bed7cbcac1e8582deda43664e5b3f19c files/digest-glibc-2.2.5-r10 290 -MD5 0b4c9c18f62f3d23bc5351eac01e4b6c files/digest-glibc-2.3.4.20050125-r1 521 +MD5 cadbf4dc76ae7f9014540c0999b391f3 files/digest-glibc-2.3.4.20050125-r1 521 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 @@ -145,7 +145,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCKu0xArHZZzCEUG0RAixDAKCJ/cYqTXtlDbL1MDhMFSTchSPK8wCeNyqq -LDlFZnVCxUuVT8JFgcvuXpo= -=NiT7 +iD8DBQFCLDwSArHZZzCEUG0RAhVwAJ9s0SGMSBP32mv6sYqUZFOh0vQMvwCdGsif +k8eINOz8VsSSipbfy44CMWI= +=saow -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 index ce0d5a007af6..07376ef34a15 100644 --- a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 +++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 @@ -1,7 +1,7 @@ MD5 174ac5ed4f2851fcc866a3bac1e4a6a5 glibc-2.3.4.tar.bz2 13213560 MD5 7a199cd4965eb5622163756ae64358fe glibc-linuxthreads-2.3.4.tar.bz2 236183 MD5 1f586b91280665cb8df70bdd7c4583ba glibc-libidn-2.3.4.tar.bz2 100711 -MD5 1121ef72702470c712a4b64a155c0d4a glibc-2.3.4-patches-1.4.tar.bz2 32627 +MD5 52058e69010109f8eff19c79c4b667ab glibc-2.3.4-patches-1.5.tar.bz2 32894 MD5 071ec6e3562813a382b75610980bab98 glibc-manpages-2.3.4-r1.tar.bz2 22276 MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898 MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998 diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild index 92083a23a9bd..6746967809b7 100644 --- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20050125-r1.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.4.20050125-r1.ebuild,v 1.16 2005/03/06 11:44:08 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.17 2005/03/07 11:33:18 eradicator Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="2.3.4-r1" GLIBC_INFOPAGE_VERSION="2.3.4-r1" # Gentoo patchset -PATCH_VER="1.4" +PATCH_VER="1.5" # C Stubbs addon (contained in fedora, so ignoring) #CSTUBS_VER="2.1.2" @@ -1027,6 +1027,10 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1 virtual/os-headers nls? ( sys-devel/gettext )" +RDEPEND="virtual/os-headers + sys-apps/baselayout + nls? ( sys-devel/gettext )" + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} >=${CATEGORY}/gcc-3.3.5-r1" @@ -1038,11 +1042,22 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} >=${CATEGORY}/linux-headers-2.6.8" fi -fi -RDEPEND="virtual/os-headers - sys-apps/baselayout - nls? ( sys-devel/gettext )" + case ${CTARGET} in + x86_64*) + [[ ${CHOST/-*/} == "i686" ]] || RDEPEND="${RDEPEND} cross-i686-pc-linux-gnu/${PN}" + ;; + sparc64*) + [[ ${CHOST/-*/} == "sparc" ]] || RDEPEND="${RDEPEND} cross-sparc-unknown-linux-gnu/${PN}" + ;; + ppc64*) + [[ ${CHOST/-*/} == "powerpc" ]] || RDEPEND="${RDEPEND} cross-powerpc-unknown-linux-gnu/${PN}" + ;; + mips64*) + [[ ${CHOST/-*/} == "mips" ]] || RDEPEND="${RDEPEND} cross-mips-unknown-linux-gnu/${PN}" + ;; + esac +fi # until amd64's 2004.3 is purged out of existence PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-2.3.4 ) )" |