From 12646dca3be2c1ba1bcd8c9593cdb3c41093f702 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 11 Jan 2005 11:53:06 +0000 Subject: [PATCH] emul-linux-x86 updates. --- sys-libs/glibc/Manifest | 10 +++++----- sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild | 16 +++++++++------- sys-libs/glibc/glibc-2.3.4.20041102.ebuild | 16 +++++++++------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 2592de54fafe..bc92ae11678c 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -5,8 +5,8 @@ MD5 d8ad30ce7b4508576195e7adf359bbdd ChangeLog 63907 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 68b59f6a267b5387156243400efeb299 glibc-2.3.4.20040808-r1.ebuild 25745 -MD5 3a7938a240da34b92f8dfbfe5bc75c18 glibc-2.3.4.20041102.ebuild 30701 +MD5 0a2ee92cc110071d09a0a34efd1cebf0 glibc-2.3.4.20040808-r1.ebuild 25827 +MD5 1772c6e333e01b25b5336458d494b17c glibc-2.3.4.20041102.ebuild 30812 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) -iD8DBQFB4z0dArHZZzCEUG0RAqRSAJkBPY1vVAveexyRCBGQzydn55BKVACfdceX -B7ujeG7AGPoRHUSvOZN6ppY= -=fKny +iD8DBQFB475WArHZZzCEUG0RAhduAJ40MGLGw1XBpN/OzrLgQtpC/gD7egCeKNt1 +HJubw33WV/OTBrwvJTV7/WM= +=lI6/ -----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 52cb30691598..04eec2ce1405 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.25 2005/01/11 02:42:26 eradicator Exp $ +# $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 $ inherit eutils flag-o-matic gcc versionator @@ -53,7 +53,7 @@ LICENSE="LGPL-2" #~sparc: This is only used by the sparc64-multilib PROFILE_ARCH as versions # after ~2.3.3.20040420 break blackdown-jdk on sparc. KEYWORDS="x86 amd64 hppa ppc64 ~ppc -mips ~sparc" -IUSE="nls pic build nptl erandom hardened multilib debug userlocales" +IUSE="nls pic build nptl erandom hardened multilib debug userlocales emul-linux-x86" RESTRICT="nostrip multilib-pkg" # we'll handle stripping ourself #46186 # We need new cleanup attribute support from gcc for NPTL among things ... @@ -70,7 +70,7 @@ RDEPEND="virtual/os-headers sys-apps/baselayout nls? ( sys-devel/gettext )" # until we compile the 32bit glibc here -PDEPEND="amd64? ( multilib? ( app-emulation/emul-linux-x86-glibc ) )" +PDEPEND="emul-linux-x86? ( multilib? ( app-emulation/emul-linux-x86-glibc ) )" PROVIDE="virtual/glibc virtual/libc" @@ -609,13 +609,14 @@ src_unpack() { src_compile() { if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" ] && ! hasq multilib-pkg ${FEATURES}; then - OABI="${ABI}" + local OABI="${ABI}" for ABI in ${MULTILIB_ABIS}; do export ABI einfo "Compiling ${ABI} glibc" src_compile && mv ${WORKDIR}/build ${WORKDIR}/build.${ABI} done ABI="${OABI}" + unset OABI return 0 fi @@ -674,7 +675,7 @@ src_compile() { src_install() { if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" ] && ! hasq multilib-pkg ${FEATURES}; then - OABI="${ABI}" + local OABI="${ABI}" for ABI in ${MULTILIB_ABIS}; do export ABI mv ${WORKDIR}/build.${ABI} ${WORKDIR}/build @@ -691,8 +692,9 @@ src_install() { fi done - return 0 ABI="${OABI}" + unset OABI + return 0 fi setup_flags @@ -799,7 +801,7 @@ EOF rm -f ${D}/etc/localtime # Some things want this, notably ash. - dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a + dosym /usr/$(get_libdir)/libbsd-compat.a /usr/$(get_libdir)/libbsd.a # This is our new config file for building locales insinto /etc diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild index d12b2edd4cb9..e4c7f7515921 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.19 2005/01/11 02:42:26 eradicator Exp $ +# $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 $ inherit eutils flag-o-matic gcc versionator @@ -53,7 +53,7 @@ LICENSE="LGPL-2" #-sparc: Compiled fine with 3.4.1-r1, but tar would consistantly bus error when untarring the # samba-1.0.9 tarball. KEYWORDS="~amd64 ppc64 -hppa ~ia64 ~ppc ~x86 ~mips -sparc" -IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales nomalloccheck" +IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales nomalloccheck emul-linux-x86" RESTRICT="nostrip multilib-pkg" # we'll handle stripping ourself #46186 # We need new cleanup attribute support from gcc for NPTL among things ... @@ -70,7 +70,7 @@ RDEPEND="virtual/os-headers sys-apps/baselayout nls? ( sys-devel/gettext )" # until we compile the 32bit glibc here -PDEPEND="amd64? ( multilib? ( app-emulation/emul-linux-x86-glibc ) )" +PDEPEND="emul-linux-x86? ( multilib? ( app-emulation/emul-linux-x86-glibc ) )" PROVIDE="virtual/glibc virtual/libc" @@ -451,7 +451,7 @@ do_arch_ppc64_patches() { # Any needed patches for ppc64 go here # setup lib -- seems like a good place to set this up - get_libdir_override lib64 + [ -z "${MULTILIB_ABIS}" ] && get_libdir_override lib64 } @@ -693,13 +693,14 @@ glibc_do_configure() { src_compile() { if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" ] && ! hasq multilib-pkg ${FEATURES}; then - OABI="${ABI}" + local OABI="${ABI}" for ABI in ${MULTILIB_ABIS}; do export ABI einfo "Compiling ${ABI} glibc" src_compile && mv ${WORKDIR}/build ${WORKDIR}/build.${ABI} done ABI="${OABI}" + unset OABI return 0 fi @@ -720,7 +721,7 @@ src_compile() { src_install() { if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" ] && ! hasq multilib-pkg ${FEATURES}; then - OABI="${ABI}" + local OABI="${ABI}" for ABI in ${MULTILIB_ABIS}; do export ABI mv ${WORKDIR}/build.${ABI} ${WORKDIR}/build @@ -738,6 +739,7 @@ src_install() { done ABI="${OABI}" + unset OABI return 0 fi @@ -919,7 +921,7 @@ EOF rm -f ${D}/etc/localtime # Some things want this, notably ash. - dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a + dosym /usr/$(get_libdir)/libbsd-compat.a /usr/$(get_libdir)/libbsd.a insinto /etc # This is our new config file for building locales -- 2.26.2