Added a version of get_libdir from multilib.eclass so we can determine where to go...

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 5e7e265fda0b4ce995b2f7619a473684d38cdd8c..746179c45ed446d199d0f5915348a93c0a7a9774 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  11 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  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 <agaffney@gentoo.org> 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 7b47357c4b6ce9dc27e048966f247c2f5515c1df..224ef0b691d9ff9e1e3067aad5e216d68a824d22 100755 (executable)
--- 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}" ]