From d89ae3273888c378d532c95aebfb73c894bf09b1 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 11 Jan 2005 12:30:55 +0000 Subject: [PATCH] Fix bug #77476 for amd64 building x86 libc. --- sys-libs/glibc/ChangeLog | 6 +++++- sys-libs/glibc/Manifest | 12 ++++++------ sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild | 15 +++++++++------ sys-libs/glibc/glibc-2.3.4.20041102.ebuild | 17 ++++++++++------- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index fa108e62188c..78e272b731e2 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.301 2005/01/11 02:42:26 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.302 2005/01/11 12:30:55 eradicator Exp $ + + 11 Jan 2005; Jeremy Huddleston + glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild: + Fix bug #77476 for amd64 building x86 libc. 10 Jan 2005; Jeremy Huddleston glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild: diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index bc92ae11678c..65ee81f05415 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,12 +1,12 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 d8ad30ce7b4508576195e7adf359bbdd ChangeLog 63907 +MD5 cd13158dcc1642c3cabdf5c96f02f480 ChangeLog 64074 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 0a2ee92cc110071d09a0a34efd1cebf0 glibc-2.3.4.20040808-r1.ebuild 25827 -MD5 1772c6e333e01b25b5336458d494b17c glibc-2.3.4.20041102.ebuild 30812 +MD5 af5376fd9cce24f03e83f48c0d0be4d5 glibc-2.3.4.20040808-r1.ebuild 25900 +MD5 b4527db94561e39df86b4fc8aff80b82 glibc-2.3.4.20041102.ebuild 30884 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 e4c399efc30efc54fb478b897cd37149 glibc-2.3.4.20040619-r2.ebuild 21078 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 @@ -139,7 +139,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB475WArHZZzCEUG0RAhduAJ40MGLGw1XBpN/OzrLgQtpC/gD7egCeKNt1 -HJubw33WV/OTBrwvJTV7/WM= -=lI6/ +iD8DBQFB48cKArHZZzCEUG0RAtLvAKCGLwwOpILs2vJUXFVNcEN5dxk6bACfY+75 +vWb5BoglemWVgPmkF8k9oOk= +=VHXa -----END PGP SIGNATURE----- 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 04eec2ce1405..09d244ef9299 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-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.26 2005/01/11 11:53:05 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.27 2005/01/11 12:30:55 eradicator Exp $ inherit eutils flag-o-matic gcc versionator @@ -100,7 +100,7 @@ alt_libdir() { if [[ ${CTARGET} = ${CHOST} ]] ; then echo /$(get_libdir) else - echo /usr/${CTARGET}/lib + echo /usr/${CTARGET}/$(get_libdir) fi } @@ -168,7 +168,7 @@ setup_flags() { fi # AMD64 multilib - if use amd64; then + if use amd64 && [ -n "${ABI}" ]; then # We change our CHOST, so set this right here export CC="$(tc-getCC)" @@ -351,9 +351,12 @@ pkg_setup() { do_arch_amd64_patches() { cd ${S}; - # CONF_LIBDIR support - epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch - sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure + + if [ -z "${MULTILIB_ABIS}" ]; then + # CONF_LIBDIR support + epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch + sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure + fi # fixes compiling with the new binutils on at least amd64 and ia64. # see http://sources.redhat.com/ml/libc-alpha/2004-08/msg00076.html diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild index e4c7f7515921..083ca0e67c89 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-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.20 2005/01/11 11:53:06 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.21 2005/01/11 12:30:55 eradicator Exp $ inherit eutils flag-o-matic gcc versionator @@ -100,7 +100,7 @@ alt_libdir() { if [[ ${CTARGET} = ${CHOST} ]] ; then echo /$(get_libdir) else - echo /usr/${CTARGET}/lib + echo /usr/${CTARGET}/$(get_libdir) fi } @@ -168,7 +168,7 @@ setup_flags() { fi # AMD64 multilib - if use amd64; then + if use amd64 && [ -n "${ABI}" ]; then # We change our CHOST, so set this right here export CC="$(tc-getCC)" @@ -359,10 +359,13 @@ pkg_setup() { do_arch_amd64_patches() { - cd ${S}; - # CONF_LIBDIR support - epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch - sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure + cd ${S} + + if [ -z "${MULTILIB_ABIS}" ]; then + # CONF_LIBDIR support + epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch + sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure + fi } -- 2.26.2