diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2008-09-11 16:57:14 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2008-09-11 16:57:14 +0000 |
| commit | 18a599267f941556c5594d17af588a71e93f6950 (patch) | |
| tree | 1e3145337baf6983f75d6ee90751171e893bc293 /eclass | |
| parent | whitespace (diff) | |
| download | gentoo-2-18a599267f941556c5594d17af588a71e93f6950.tar.gz gentoo-2-18a599267f941556c5594d17af588a71e93f6950.tar.bz2 gentoo-2-18a599267f941556c5594d17af588a71e93f6950.zip | |
fix LDPATH on multilib systems, bug #202032
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/games.eclass | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/eclass/games.eclass b/eclass/games.eclass index 38e1b03800a3..e47e5fa84b29 100644 --- a/eclass/games.eclass +++ b/eclass/games.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.126 2008/09/05 17:02:43 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.127 2008/09/11 16:57:14 nyhm Exp $ # devlist: {vapier,wolf31o2,mr_bones_}@gentoo.org -> games@gentoo.org # @@ -32,7 +32,7 @@ export GAMES_USER_DED=${GAMES_USER_DED:-games} export GAMES_GROUP=${GAMES_GROUP:-games} games_get_libdir() { - echo ${GAMES_LIBDIR:-${GAMES_PREFIX}/$(get_libdir)} + echo ${GAMES_PREFIX}/$(get_libdir) } egamesconf() { @@ -95,25 +95,16 @@ prepgamesdirs() { } gamesenv() { - # As much as I hate doing this, we need to be a bit more flexibility with - # our library directories. - local hasit=0 GAMES_LIBDIRS="" GAMES_LIBDIR=$(games_get_libdir) - if has_multilib_profile ; then - for libdir in $(get_all_libdirs) ; do - if [[ ${GAMES_LIBDIR} != ${GAMES_PREFIX}/${libdir} ]] ; then - GAMES_LIBDIRS="${GAMES_LIBDIRS}:${GAMES_PREFIX}/${libdir}" - else - hasit=1 - fi - done - fi - [[ ${hasit} == "1" ]] \ - && GAMES_LIBDIRS=${GAMES_LIBDIRS:1} \ - || GAMES_LIBDIRS="${GAMES_LIBDIR}:${GAMES_LIBDIRS}" + local d libdirs + + for d in $(get_all_libdirs) ; do + libdirs="${libdirs}:${GAMES_PREFIX}/${d}" + done + # Wish we could use doevnd here, but we dont want the env # file to be tracked in the CONTENTS of every game cat <<-EOF > "${ROOT}"/etc/env.d/${GAMES_ENVD} - LDPATH="${GAMES_LIBDIRS}" + LDPATH="${libdirs:1}" PATH="${GAMES_BINDIR}" EOF } |