| 1 |
commit: 8bcfe8ed4b4a540e27a10d5626c2d922ddae99a0 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 26 09:37:52 2016 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 27 07:45:27 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8bcfe8ed |
| 7 |
|
| 8 |
bootstrap-prefix.sh: use tools from stage2 on RAP. |
| 9 |
|
| 10 |
scripts/bootstrap-prefix.sh | 40 +++++++++++++++++++++++++--------------- |
| 11 |
1 file changed, 25 insertions(+), 15 deletions(-) |
| 12 |
|
| 13 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 14 |
index f3d13f8..07bd986 100755 |
| 15 |
--- a/scripts/bootstrap-prefix.sh |
| 16 |
+++ b/scripts/bootstrap-prefix.sh |
| 17 |
@@ -1351,21 +1351,31 @@ bootstrap_stage3() { |
| 18 |
export MAKEINFO="echo makeinfo GNU texinfo 4.13" |
| 19 |
|
| 20 |
# Build a native compiler. |
| 21 |
- pkgs=( |
| 22 |
- $([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency |
| 23 |
- sys-libs/ncurses |
| 24 |
- sys-libs/readline |
| 25 |
- app-shells/bash |
| 26 |
- sys-apps/sed |
| 27 |
- app-arch/xz-utils |
| 28 |
- sys-apps/gentoo-functions |
| 29 |
- sys-apps/baselayout-prefix |
| 30 |
- sys-devel/m4 |
| 31 |
- sys-devel/flex |
| 32 |
- sys-devel/binutils-config |
| 33 |
- sys-libs/zlib |
| 34 |
- ${linker} |
| 35 |
- ) |
| 36 |
+ if is-rap ; then |
| 37 |
+ pkgs=( |
| 38 |
+ sys-apps/baselayout |
| 39 |
+ sys-apps/gentoo-functions |
| 40 |
+ sys-devel/binutils-config |
| 41 |
+ sys-libs/zlib |
| 42 |
+ ${linker} |
| 43 |
+ ) |
| 44 |
+ else |
| 45 |
+ pkgs=( |
| 46 |
+ $([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency |
| 47 |
+ sys-libs/ncurses |
| 48 |
+ sys-libs/readline |
| 49 |
+ app-shells/bash |
| 50 |
+ sys-apps/sed |
| 51 |
+ app-arch/xz-utils |
| 52 |
+ sys-apps/gentoo-functions |
| 53 |
+ sys-apps/baselayout-prefix |
| 54 |
+ sys-devel/m4 |
| 55 |
+ sys-devel/flex |
| 56 |
+ sys-devel/binutils-config |
| 57 |
+ sys-libs/zlib |
| 58 |
+ ${linker} |
| 59 |
+ ) |
| 60 |
+ fi |
| 61 |
emerge_pkgs --nodeps "${pkgs[@]}" || return 1 |
| 62 |
|
| 63 |
if is-rap && [[ ! -x "${ROOT}"/usr/bin/perl ]]; then |
Archives