vapier 14/09/10 08:16:30
Modified: src_test.eblit src_install.eblit
Log:
Convert src_{install,test} fully over to `builddir`.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.7 sys-libs/glibc/files/eblits/src_test.eblit
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?r1=1.6&r2=1.7
Index: src_test.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src_test.eblit 21 Aug 2014 14:08:41 -0000 1.6
+++ src_test.eblit 10 Sep 2014 08:16:30 -0000 1.7
@@ -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
1.37 sys-libs/glibc/files/eblits/src_install.eblit
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.37&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.37&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?r1=1.36&r2=1.37
Index: src_install.eblit
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- src_install.eblit 21 Aug 2014 14:41:39 -0000 1.36
+++ src_install.eblit 10 Sep 2014 08:16:30 -0000 1.37
@@ -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
