diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-08-21 13:59:18 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-08-21 13:59:18 +0000 |
| commit | e6f44d36c1bf31a55a29468eb086e3ccaed8bc51 (patch) | |
| tree | 58b838f4a29aeffbe99f75719edfc9235cf39b38 /sys-libs | |
| parent | dev-util/nvidia-cuda-sdk: Fix doc installation, thanks mabre telling me that (diff) | |
| download | gentoo-2-e6f44d36c1bf31a55a29468eb086e3ccaed8bc51.tar.gz gentoo-2-e6f44d36c1bf31a55a29468eb086e3ccaed8bc51.tar.bz2 gentoo-2-e6f44d36c1bf31a55a29468eb086e3ccaed8bc51.zip | |
Only set ED/EROOT when using old EAPIs.
(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 | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 5c79e00e16b1..1d01df07c6d9 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # 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.1008 2014/08/17 16:24:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1009 2014/08/21 13:59:18 vapier Exp $ + + 21 Aug 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit: + Only set ED/EROOT when using old EAPIs. 17 Aug 2014; Jeroen Roovers <jer@gentoo.org> glibc-2.19-r1.ebuild: Stable for HPPA (bug #518364). diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index aa6149a14604..db912c450068 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -1,13 +1,15 @@ # 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.36 2014/07/28 05:46:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.37 2014/08/21 13:59:18 vapier Exp $ alt_prefix() { is_crosscompile && echo /usr/${CTARGET} } -: ${ED:=${D}} -: ${EROOT:=${ROOT}} +if [[ ${EAPI:-0} == [012] ]] ; then + : ${ED:=${D}} + : ${EROOT:=${ROOT}} +fi # We need to be able to set alternative headers for # compiling for non-native platform |