| 1 |
commit: 2e5a7a84af53d3704290adfe5273f60ff5116180 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 26 09:41:35 2016 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 27 07:45:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2e5a7a84 |
| 7 |
|
| 8 |
bootstrap-prefix.sh: get_libdir for multilib support on RAP. |
| 9 |
|
| 10 |
scripts/bootstrap-prefix.sh | 10 ++++++---- |
| 11 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 14 |
index 9990e41..f3d13f8 100755 |
| 15 |
--- a/scripts/bootstrap-prefix.sh |
| 16 |
+++ b/scripts/bootstrap-prefix.sh |
| 17 |
@@ -9,6 +9,7 @@ eerror() { echo "!!! $*" 1>&2; } |
| 18 |
einfo() { echo "* $*"; } |
| 19 |
is-rap() { [[ ${BASH_SOURCE} = *rap.sh ]]; } |
| 20 |
rapx() { is-rap && echo $1 || echo $2; } |
| 21 |
+get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI); } |
| 22 |
|
| 23 |
# prefer gtar over tar |
| 24 |
[[ x$(type -t gtar) == "xfile" ]] \ |
| 25 |
@@ -124,7 +125,7 @@ configure_cflags() { |
| 26 |
export LDFLAGS="-L${ROOT}/tmp/usr/lib" |
| 27 |
;; |
| 28 |
*) |
| 29 |
- export LDFLAGS="-L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib" |
| 30 |
+ export LDFLAGS="-L${ROOT}/tmp/usr/$(get_libdir) -Wl,-rpath=${ROOT}/tmp/usr/$(get_libdir)" |
| 31 |
;; |
| 32 |
esac |
| 33 |
|
| 34 |
@@ -407,7 +408,7 @@ EOF |
| 35 |
|
| 36 |
do_tree() { |
| 37 |
local x |
| 38 |
- for x in etc{,/portage} usr/{{,s}bin,lib} var/tmp var/lib/portage var/log/portage var/db; |
| 39 |
+ for x in etc{,/portage} usr/{{,s}bin,$(rapx "" lib)} var/tmp var/lib/portage var/log/portage var/db; |
| 40 |
do |
| 41 |
[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" |
| 42 |
done |
| 43 |
@@ -423,7 +424,7 @@ do_tree() { |
| 44 |
[[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} ) |
| 45 |
done |
| 46 |
else |
| 47 |
- for x in lib sbin ; do |
| 48 |
+ for x in $(rapx "" lib) sbin ; do |
| 49 |
[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" |
| 50 |
done |
| 51 |
fi |
| 52 |
@@ -531,6 +532,7 @@ bootstrap_portage() { |
| 53 |
[[ -x ${ROOT}/tmp/bin/bash ]] || [[ ! -x ${ROOT}/tmp/usr/bin/bash ]] || ln -s ../usr/bin/bash "${ROOT}"/tmp/bin/bash || return 1 |
| 54 |
[[ -x ${ROOT}/tmp/bin/bash ]] || ln -s "${BASH}" "${ROOT}"/tmp/bin/bash || return 1 |
| 55 |
[[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || return 1 |
| 56 |
+ [[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash || return 1 |
| 57 |
[[ -x ${ROOT}/bin/sh ]] || ln -s ../tmp/bin/sh "${ROOT}"/bin/sh || return 1 |
| 58 |
export PORTAGE_BASH="${ROOT}"/tmp/bin/bash |
| 59 |
|
| 60 |
@@ -1335,7 +1337,7 @@ bootstrap_stage3() { |
| 61 |
configure_toolchain || return 1 |
| 62 |
export CONFIG_SHELL="${ROOT}"/tmp/bin/bash |
| 63 |
export CPPFLAGS="-I${ROOT}/usr/include" |
| 64 |
- export LDFLAGS="-L${ROOT}/usr/lib" |
| 65 |
+ export LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
| 66 |
unset CC CXX |
| 67 |
|
| 68 |
emerge_pkgs() { |
Archives