diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2004-09-17 10:37:58 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2004-09-17 10:37:58 +0000 |
| commit | 86c446d56fc115339f5f547e2d8bb2009f3977af (patch) | |
| tree | bd21e242c723e32b23da3b628784cffdc5b6564e /eclass | |
| parent | Stable on alpha, bug 64168. (Manifest recommit) (diff) | |
| download | gentoo-2-86c446d56fc115339f5f547e2d8bb2009f3977af.tar.gz gentoo-2-86c446d56fc115339f5f547e2d8bb2009f3977af.tar.bz2 gentoo-2-86c446d56fc115339f5f547e2d8bb2009f3977af.zip | |
get_libdir() now check for CONF_LIBDIR in the code of econf() instead of
checking for the portage version. So there is now no more portageq usage
in "global scope". Tested with both portage 2.0.50-r11 and 2.0.51_rc1.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 7cb17ac7fe7c..2d3a86df1a2c 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.102 2004/09/16 14:05:07 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.103 2004/09/17 10:37:58 kugelfang Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -51,17 +51,26 @@ ebeep() { # # Travis Tilley <lv@gentoo.org> (24 Aug 2004) get_libdir() { + LIBDIR_TEST=$(type econf) if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then # if there is an override, we want to use that... always. CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" - elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then - # and if there isnt an override, and we're using a version of - # portage without CONF_LIBDIR support, force the use of lib. dolib - # and friends from portage 2.0.50 wont be too happy otherwise. + # We don't need to know the verison of portage. We only need to know + # if there is support for CONF_LIBDIR in econf and co. + # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 + #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then + # # and if there isnt an override, and we're using a version of + # # portage without CONF_LIBDIR support, force the use of lib. dolib + # # and friends from portage 2.0.50 wont be too happy otherwise. + # CONF_LIBDIR="lib" + #fi + elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support + # will be <portage-2.0.51_pre20 CONF_LIBDIR="lib" fi # and of course, default to lib if CONF_LIBDIR isnt set echo ${CONF_LIBDIR:=lib} + unset LIBDIR_TEST } |