diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-08-21 14:08:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-08-21 14:08:41 +0000 |
| commit | 380235e9a78f1edc166acf499646bb9a6d2d4932 (patch) | |
| tree | 47c0faafa3f157c69c8ef89c86597e077ae6837f /sys-libs | |
| parent | Modernize the `find` commands. (diff) | |
| download | gentoo-2-380235e9a78f1edc166acf499646bb9a6d2d4932.tar.gz gentoo-2-380235e9a78f1edc166acf499646bb9a6d2d4932.tar.bz2 gentoo-2-380235e9a78f1edc166acf499646bb9a6d2d4932.zip | |
Move LD_ASSUME_KERNEL clearing to common env setup w/other ldso var.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 3 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_compile.eblit | 3 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_test.eblit | 5 |
4 files changed, 10 insertions, 7 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 6d00be5447f6..c9092002f59c 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.1010 2014/08/21 14:06:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1011 2014/08/21 14:08:41 vapier Exp $ + + 21 Aug 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit, + files/eblits/src_compile.eblit, files/eblits/src_test.eblit: + Move LD_ASSUME_KERNEL clearing to common env setup w/other ldso var. 21 Aug 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/src_unpack.eblit: Modernize the `find` commands. diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index db912c450068..6379f05be6cd 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -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.37 2014/08/21 13:59:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.38 2014/08/21 14:08:41 vapier Exp $ alt_prefix() { is_crosscompile && echo /usr/${CTARGET} @@ -269,6 +269,7 @@ use_multiarch() { setup_env() { # silly users unset LD_RUN_PATH + unset LD_ASSUME_KERNEL multilib_env ${CTARGET_OPT:-${CTARGET}} if is_crosscompile || tc-is-cross-compiler ; then diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit index 1cb0f7c160a8..4733a9d7cf21 100644 --- a/sys-libs/glibc/files/eblits/src_compile.eblit +++ b/sys-libs/glibc/files/eblits/src_compile.eblit @@ -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.38 2014/03/29 05:31:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.39 2014/08/21 14:08:41 vapier Exp $ glibc_do_configure() { local myconf=() @@ -161,7 +161,6 @@ toolchain-glibc_src_compile() { fi if want_nptl ; then # ... and then do the optional nptl build - unset LD_ASSUME_KERNEL glibc_do_configure nptl emake || die "make for ${ABI} failed" fi diff --git a/sys-libs/glibc/files/eblits/src_test.eblit b/sys-libs/glibc/files/eblits/src_test.eblit index 532bc8ce0911..c1441aad98b4 100644 --- a/sys-libs/glibc/files/eblits/src_test.eblit +++ b/sys-libs/glibc/files/eblits/src_test.eblit @@ -1,10 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.5 2013/04/11 20:42:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.6 2014/08/21 14:08:41 vapier Exp $ toolchain-glibc_src_test() { cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1" - unset LD_ASSUME_KERNEL 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 |