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

[Benda XU]

commit:     8bcfe8ed4b4a540e27a10d5626c2d922ddae99a0
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 09:37:52 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri May 27 07:45:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8bcfe8ed

bootstrap-prefix.sh: use tools from stage2 on RAP.

 scripts/bootstrap-prefix.sh | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f3d13f8..07bd986 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1351,21 +1351,31 @@ bootstrap_stage3() {
        export MAKEINFO="echo makeinfo GNU texinfo 4.13"
        
        # Build a native compiler.
-       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
-               sys-apps/baselayout-prefix
-               sys-devel/m4
-               sys-devel/flex
-               sys-devel/binutils-config
-               sys-libs/zlib
-               ${linker}
-       )
+       if is-rap ; then
+               pkgs=(
+                       sys-apps/baselayout
+                       sys-apps/gentoo-functions
+                       sys-devel/binutils-config
+                       sys-libs/zlib
+                       ${linker}
+               )
+       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
+                       sys-apps/baselayout-prefix
+                       sys-devel/m4
+                       sys-devel/flex
+                       sys-devel/binutils-config
+                       sys-libs/zlib
+                       ${linker}
+               )
+       fi
        emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
        if is-rap && [[ ! -x "${ROOT}"/usr/bin/perl ]]; then