1 |
commit: 4bca0eda63345255cd61d2f98dd42cf7cf13c9de |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 7 01:46:57 2016 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 7 02:40:57 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4bca0eda |
7 |
|
8 |
bootstrap-prefix.sh: get_libdir for multilib support on RAP. |
9 |
|
10 |
scripts/bootstrap-prefix.sh | 11 +++++++---- |
11 |
1 file changed, 7 insertions(+), 4 deletions(-) |
12 |
|
13 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
14 |
index af2f690..fd35927 100755 |
15 |
--- a/scripts/bootstrap-prefix.sh |
16 |
+++ b/scripts/bootstrap-prefix.sh |
17 |
@@ -412,7 +412,7 @@ bootstrap_setup() { |
18 |
|
19 |
do_tree() { |
20 |
local x |
21 |
- for x in etc{,/portage} usr/{{,s}bin,lib} var/tmp var/lib/portage var/log/portage var/db; |
22 |
+ for x in etc{,/portage} usr/{{,s}bin,$(rapx "" lib)} var/tmp var/lib/portage var/log/portage var/db; |
23 |
do |
24 |
[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" |
25 |
done |
26 |
@@ -428,7 +428,7 @@ do_tree() { |
27 |
[[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} ) |
28 |
done |
29 |
else |
30 |
- for x in lib sbin ; do |
31 |
+ for x in $(rapx "" lib) sbin ; do |
32 |
[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" |
33 |
done |
34 |
fi |
35 |
@@ -537,7 +537,8 @@ bootstrap_portage() { |
36 |
[[ -x ${ROOT}/tmp/bin/bash ]] || [[ ! -x ${ROOT}/tmp/usr/bin/bash ]] || ln -s ../usr/bin/bash "${ROOT}"/tmp/bin/bash || return 1 |
37 |
[[ -x ${ROOT}/tmp/bin/bash ]] || ln -s "${BASH}" "${ROOT}"/tmp/bin/bash || return 1 |
38 |
[[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || return 1 |
39 |
- [[ -x ${ROOT}/bin/sh ]] || ln -s ../tmp/bin/sh "${ROOT}"/bin/sh || return 1 |
40 |
+ [[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash || return 1 |
41 |
+ [[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1 |
42 |
export PORTAGE_BASH="${ROOT}"/tmp/bin/bash |
43 |
|
44 |
einfo "Compiling ${A%-*}" |
45 |
@@ -1336,10 +1337,12 @@ bootstrap_stage3() { |
46 |
fi |
47 |
fi |
48 |
|
49 |
+ get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI) || echo lib; } |
50 |
+ |
51 |
configure_toolchain || return 1 |
52 |
export CONFIG_SHELL="${ROOT}"/tmp/bin/bash |
53 |
export CPPFLAGS="-I${ROOT}/usr/include" |
54 |
- export LDFLAGS="-L${ROOT}/usr/lib" |
55 |
+ export LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
56 |
unset CC CXX |
57 |
|
58 |
emerge_pkgs() { |