vapier 14/08/21 14:41:39 Modified: common.eblit src_compile.eblit src_install.eblit Log: Move builddir logic into a single func to reduce duplication. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.39 sys-libs/glibc/files/eblits/common.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.39&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.39&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.38&r2=1.39 Index: common.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- common.eblit 21 Aug 2014 14:08:41 -0000 1.38 +++ common.eblit 21 Aug 2014 14:41:39 -0000 1.39 @@ -1,6 +1,6 @@ # 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/common.eblit,v 1.38 2014/08/21 14:08:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.39 2014/08/21 14:41:39 vapier Exp $ alt_prefix() { is_crosscompile && echo /usr/${CTARGET} @@ -40,6 +40,10 @@ echo $(alt_prefix)/usr/$(get_libdir) } +builddir() { + echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1" +} + setup_target_flags() { # This largely mucks with compiler flags. None of which should matter # when building up just the headers. 1.40 sys-libs/glibc/files/eblits/src_compile.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.40&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.40&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?r1=1.39&r2=1.40 Index: src_compile.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- src_compile.eblit 21 Aug 2014 14:08:41 -0000 1.39 +++ src_compile.eblit 21 Aug 2014 14:41:39 -0000 1.40 @@ -1,6 +1,6 @@ # 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_compile.eblit,v 1.39 2014/08/21 14:08:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.40 2014/08/21 14:41:39 vapier Exp $ glibc_do_configure() { local myconf=() @@ -105,9 +105,9 @@ export ac_cv_prog_MAKEINFO=: fi - local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 - mkdir -p "${GBUILDDIR}" - cd "${GBUILDDIR}" + local builddir=$(builddir "$1") + mkdir -p "${builddir}" + cd "${builddir}" set -- "${S}"/configure "${myconf[@]}" echo "$@" "$@" || die "failed to configure glibc" @@ -167,9 +167,9 @@ } toolchain-glibc_headers_compile() { - local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - mkdir -p "${GBUILDDIR}" - cd "${GBUILDDIR}" + local builddir=$(builddir "headers") + mkdir -p "${builddir}" + cd "${builddir}" # if we don't have a compiler yet, we cant really test it now ... # hopefully they don't affect header geneation, so let's hope for 1.36 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.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?r1=1.35&r2=1.36 Index: src_install.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- src_install.eblit 25 Mar 2014 00:34:56 -0000 1.35 +++ src_install.eblit 21 Aug 2014 14:41:39 -0000 1.36 @@ -1,14 +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_install.eblit,v 1.35 2014/03/25 00:34:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.36 2014/08/21 14:41:39 vapier Exp $ toolchain-glibc_src_install() { - local GBUILDDIR - if want_linuxthreads ; then - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads - else - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl - fi + local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl)) local install_root="${D}$(alt_prefix)" if want_linuxthreads ; then @@ -212,8 +207,8 @@ } toolchain-glibc_headers_install() { - local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - cd "${GBUILDDIR}" + local builddir=$(builddir "headers") + cd "${builddir}" emake install_root="${D}$(alt_prefix)" install-headers || die if ! version_is_at_least 2.16 ; then insinto $(alt_headers)/bits
