diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-18 08:36:50 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-18 08:36:50 +0000 |
| commit | 8b58a81f0d61333356a9cb3046151670dd9c809c (patch) | |
| tree | 72df7dc49554a5911c19564a6d99b04e199ca7ec /sys-libs | |
| parent | New version and cleanup (Manifest recommit) (diff) | |
| download | gentoo-2-8b58a81f0d61333356a9cb3046151670dd9c809c.tar.gz gentoo-2-8b58a81f0d61333356a9cb3046151670dd9c809c.tar.bz2 gentoo-2-8b58a81f0d61333356a9cb3046151670dd9c809c.zip | |
Fixed multilib build dirs.
(Portage version: 2.0.51-r13)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20041102.ebuild | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild index 34b9bf900c5a..dec35305b414 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.34 2005/01/18 06:34:18 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.35 2005/01/18 08:36:50 eradicator Exp $ inherit eutils multilib flag-o-matic toolchain-funcs versionator @@ -697,11 +697,7 @@ glibc_do_configure() { --infodir=$(alt_prefix)/share/info --libexecdir=$(alt_prefix)/lib/misc" - if [ -n "${ABI}" ]; then - GBUILDDIR="${WORKDIR}/build-${ABI}-${CTARGET}-$1" - else - GBUILDDIR="${WORKDIR}/build-${CTARGET}-$1" - fi + GBUILDDIR="${WORKDIR}/build-${ABI}-${CTARGET}-$1" mkdir -p ${GBUILDDIR} cd ${GBUILDDIR} einfo "Configuring GLIBC for $1 with: ${myconf}" @@ -724,6 +720,8 @@ src_compile() { fi unset MLTEST + ABI=${ABI:=default} + # do the linuxthreads build unless we're using nptlonly if use !nptlonly ; then glibc_do_configure linuxthreads @@ -785,6 +783,8 @@ src_install() { fi unset MLTEST + ABI=${ABI:=default} + setup_flags # Need to dodir first because it might not exist (bad amd64 profiles) @@ -795,19 +795,19 @@ src_install() { unset LANGUAGE LANG LC_ALL if use nptlonly ; then - MYMAINBUILDDIR=build-${CTARGET}-nptl + MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl else - MYMAINBUILDDIR=build-${CTARGET}-linuxthreads + MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads fi if use !nptlonly ; then - cd ${WORKDIR}/build-${CTARGET}-linuxthreads + cd ${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads einfo "Installing GLIBC with linuxthreads..." make PARALLELMFLAGS="${MAKEOPTS}" \ install_root=${D} \ install || die elif use nptlonly ; then - cd ${WORKDIR}/build-${CTARGET}-nptl + cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl einfo "Installing GLIBC with NPTL..." make PARALLELMFLAGS="${MAKEOPTS}" \ install_root=${D} \ @@ -820,7 +820,7 @@ src_install() { if use !nptlonly && want_nptl ; then einfo "Installing NPTL to $(get_libdir)/tls/..." - cd ${WORKDIR}/build-${CTARGET}-nptl + cd ${WORKDIR}/build-${ABI}-${CTARGET}-nptl mkdir -p ${D}/$(get_libdir)/tls/ libcsofile=$(basename ${D}/$(get_libdir)/libc-*.so) |