diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-09-10 08:16:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-09-10 08:16:30 +0000 |
| commit | ec13e49bace70991f905c34c0d9e81097929834f (patch) | |
| tree | 0da5ead9aef2828197e86d5000d66e7323f7c0b3 /sys-libs/glibc | |
| parent | Hardcode version in path, bug 522470 (diff) | |
| download | gentoo-2-ec13e49bace70991f905c34c0d9e81097929834f.tar.gz gentoo-2-ec13e49bace70991f905c34c0d9e81097929834f.tar.bz2 gentoo-2-ec13e49bace70991f905c34c0d9e81097929834f.zip | |
Convert src_{install,test} fully over to `builddir`.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_install.eblit | 15 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_test.eblit | 4 |
3 files changed, 11 insertions, 14 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index cff05a905865..e9af381e0b68 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1017 2014/09/10 07:46:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1018 2014/09/10 08:16:30 vapier Exp $ + + 10 Sep 2014; Mike Frysinger <vapier@gentoo.org> + files/eblits/src_install.eblit, files/eblits/src_test.eblit: + Convert src_{install,test} fully over to `builddir`. 10 Sep 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/src_compile.eblit: diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index f667e6e32925..5971681d56cd 100644 --- a/sys-libs/glibc/files/eblits/src_install.eblit +++ b/sys-libs/glibc/files/eblits/src_install.eblit @@ -1,23 +1,16 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.36 2014/08/21 14:41:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.37 2014/09/10 08:16:30 vapier Exp $ toolchain-glibc_src_install() { local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl)) + cd "${builddir}" - local install_root="${D}$(alt_prefix)" - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Installing GLIBC ${ABI} with linuxthreads ..." - else - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - einfo "Installing GLIBC ${ABI} with NPTL ..." - fi - emake install_root="${install_root}" install || die + emake install_root="${D}$(alt_prefix)" install || die if want_linuxthreads && want_nptl ; then einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl + cd "$(builddir nptl)" dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl local l src_lib diff --git a/sys-libs/glibc/files/eblits/src_test.eblit b/sys-libs/glibc/files/eblits/src_test.eblit index c1441aad98b4..088da439b13b 100644 --- a/sys-libs/glibc/files/eblits/src_test.eblit +++ b/sys-libs/glibc/files/eblits/src_test.eblit @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.6 2014/08/21 14:08:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.7 2014/09/10 08:16:30 vapier Exp $ toolchain-glibc_src_test() { - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1" + cd "$(builddir $1)" emake -j1 check && return 0 einfo "make check failed - re-running with --keep-going to get the rest of the results" emake -j1 -k check |