[gentoo-commits] repo/proj/prefix:script-rap commit in: scripts/

[Benda XU]

commit:     2e5a7a84af53d3704290adfe5273f60ff5116180
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 09:41:35 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri May 27 07:45:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2e5a7a84

bootstrap-prefix.sh: get_libdir for multilib support on RAP.

 scripts/bootstrap-prefix.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9990e41..f3d13f8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -9,6 +9,7 @@ eerror() { echo "!!! $*" 1>&2; }
 einfo() { echo "* $*"; }
 is-rap() { [[ ${BASH_SOURCE} = *rap.sh ]]; }
 rapx() { is-rap && echo $1 || echo $2; }
+get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI); }
 
 # prefer gtar over tar
 [[ x$(type -t gtar) == "xfile" ]] \
@@ -124,7 +125,7 @@ configure_cflags() {
                        export LDFLAGS="-L${ROOT}/tmp/usr/lib"
                        ;;
                *)
-                       export LDFLAGS="-L${ROOT}/tmp/usr/lib 
-Wl,-rpath=${ROOT}/tmp/usr/lib"
+                       export LDFLAGS="-L${ROOT}/tmp/usr/$(get_libdir) 
-Wl,-rpath=${ROOT}/tmp/usr/$(get_libdir)"
                        ;;
        esac
 
@@ -407,7 +408,7 @@ EOF
 
 do_tree() {
        local x
-       for x in etc{,/portage} usr/{{,s}bin,lib} var/tmp var/lib/portage 
var/log/portage var/db;
+       for x in etc{,/portage} usr/{{,s}bin,$(rapx "" lib)} var/tmp 
var/lib/portage var/log/portage var/db;
        do
                [[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}"
        done
@@ -423,7 +424,7 @@ do_tree() {
                        [[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s 
usr/${x} )
                done
        else
-               for x in lib sbin ; do
+               for x in $(rapx "" lib) sbin ; do
                        [[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}"
                done
        fi
@@ -531,6 +532,7 @@ bootstrap_portage() {
        [[ -x ${ROOT}/tmp/bin/bash ]] || [[ ! -x ${ROOT}/tmp/usr/bin/bash ]] || 
ln -s ../usr/bin/bash "${ROOT}"/tmp/bin/bash || return 1
        [[ -x ${ROOT}/tmp/bin/bash ]] || ln -s "${BASH}" "${ROOT}"/tmp/bin/bash 
|| return 1
        [[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || 
return 1
+       [[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash 
|| return 1
        [[ -x ${ROOT}/bin/sh ]] || ln -s ../tmp/bin/sh "${ROOT}"/bin/sh || 
return 1
        export PORTAGE_BASH="${ROOT}"/tmp/bin/bash
 
@@ -1335,7 +1337,7 @@ bootstrap_stage3() {
        configure_toolchain || return 1
        export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
        export CPPFLAGS="-I${ROOT}/usr/include"
-       export LDFLAGS="-L${ROOT}/usr/lib"
+       export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
        unset CC CXX
 
        emerge_pkgs() {