diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-03-16 20:09:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-16 20:09:10 +0000 |
| commit | bcb771de77b59c13707417032b6be7a0db4d9266 (patch) | |
| tree | b28dbb38c8d4a681dda904abd7be15b960daa5d3 /eclass/multilib.eclass | |
| parent | ppc64 stable wrt #349262 (diff) | |
| download | historical-bcb771de77b59c13707417032b6be7a0db4d9266.tar.gz historical-bcb771de77b59c13707417032b6be7a0db4d9266.tar.bz2 historical-bcb771de77b59c13707417032b6be7a0db4d9266.zip | |
get_all_libdirs: append "lib" only if it wasnt already seen rather than always making it the first item #357225
Diffstat (limited to 'eclass/multilib.eclass')
| -rw-r--r-- | eclass/multilib.eclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 0109a0df6835..c74a71d77c1b 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.84 2011/03/10 05:01:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.85 2011/03/16 20:09:10 vapier Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -237,13 +237,14 @@ get_all_abis() { # those that might not be touched by the current ebuild and always includes # "lib". get_all_libdirs() { - local libdirs="lib" + local libdirs local abi local dir for abi in ${MULTILIB_ABIS}; do - [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" + libdirs+=" $(get_abi_LIBDIR ${abi})" done + [[ " ${libdirs} " != *" lib "* ]] && libdirs+=" lib" echo "${libdirs}" } |