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

[Benda XU]

commit:     c81194a94820ab2edb8b16102416b7dbbec54c76
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 09:26:44 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 09:27:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c81194a9

stage3: use symlinked bash from stage2.

  link with absolute path, because bin/ could be symlinked to usr/bin/.

 scripts/bootstrap-prefix.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 42c01c4..43a401b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -552,7 +552,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/bash ]] || ln -s "${ROOT}"{/tmp,}/bin/bash || return 1
        [[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1
        export PORTAGE_BASH="${ROOT}"/tmp/bin/bash
 
@@ -1430,10 +1430,6 @@ bootstrap_stage3() {
                emerge_pkgs --nodeps "${pkgs[@]}" || return 1
        else
                pkgs=(
-                       $([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) 
# bash dependency
-                       sys-libs/ncurses
-                       sys-libs/readline
-                       app-shells/bash
                        sys-apps/sed
                        app-arch/xz-utils
                        sys-apps/gentoo-functions