From: Chris Gianelloni Date: Thu, 11 Oct 2007 23:26:48 +0000 (+0000) Subject: Added a version of get_libdir from multilib.eclass so we can determine where to go... X-Git-Tag: CATALYST_2_0_6_916~247 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8ad51b73b22f15b99f3841c9cf05e8a11a826bf;p=catalyst.git Added a version of get_libdir from multilib.eclass so we can determine where to go poking around if we need to touch anything in libdir. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1247 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 5e7e265f..746179c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 11 Oct 2007; Chris Gianelloni + targets/support/chroot-functions.sh: + Added a version of get_libdir from multilib.eclass so we can determine where + to go poking around if we need to touch anything in libdir. + 11 Oct 2007; Andrew Gaffney catalyst: print an error saying what target failed before the traceback diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 7b47357c..224ef0b6 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -1,3 +1,4 @@ +#!/bin/bash # Trap these signals and kill ourselves if recieved # Force ourselves to die if any of these signals are recieved @@ -34,6 +35,32 @@ check_genkernel_version(){ fi } +get_libdir() { + DEFAULT_ABI=$(portageq envvar DEFAULT_ABI) + LIBDIR_default=$(portageq envvar LIBDIR_default) + MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} + export DEFAULT_ABI=${DEFAULT_ABI:-"default"} + export LIBDIR_default=${CONF_LIBDIR:-"lib"} + + local abi + if [ $# -gt 0 ] + then + abi=${1} + elif [ -n "${ABI}" ] + then + abi=${ABI} + elif [ -n "${DEFAULT_ABI}" ] + then + abi=${DEFAULT_ABI} + else + abi="default" + fi + + local var="LIBDIR_${abi}" + var=$(portageq envvar ${var}) + echo ${var} +} + setup_myfeatures(){ setup_myemergeopts if [ -n "${clst_CCACHE}" ]