From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 579B01382F6 for ; Thu, 7 Jul 2016 02:41:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1000D1400F; Thu, 7 Jul 2016 02:41:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEE73E0AEB for ; Thu, 7 Jul 2016 02:41:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8D5C340D4D for ; Thu, 7 Jul 2016 02:41:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78C3B244B for ; Thu, 7 Jul 2016 02:41:24 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1467859257.4bca0eda63345255cd61d2f98dd42cf7cf13c9de.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 4bca0eda63345255cd61d2f98dd42cf7cf13c9de X-VCS-Branch: master Date: Thu, 7 Jul 2016 02:41:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e05e53ee-2c69-4208-86b4-c9dbd9ccbd00 X-Archives-Hash: 67458e7bec63944e8e486aec36314d00 commit: 4bca0eda63345255cd61d2f98dd42cf7cf13c9de Author: Benda Xu gentoo org> AuthorDate: Thu Jul 7 01:46:57 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Thu Jul 7 02:40:57 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4bca0eda bootstrap-prefix.sh: get_libdir for multilib support on RAP. scripts/bootstrap-prefix.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index af2f690..fd35927 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -412,7 +412,7 @@ bootstrap_setup() { do_tree() { local x - for x in etc{,/portage} usr/{{,s}bin,lib} var/tmp var/lib/portage var/log/portage var/db; + for x in etc{,/portage} usr/{{,s}bin,$(rapx "" lib)} var/tmp var/lib/portage var/log/portage var/db; do [[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" done @@ -428,7 +428,7 @@ do_tree() { [[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} ) done else - for x in lib sbin ; do + for x in $(rapx "" lib) sbin ; do [[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" done fi @@ -537,7 +537,8 @@ 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/sh ]] || ln -s ../tmp/bin/sh "${ROOT}"/bin/sh || return 1 + [[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash || return 1 + [[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1 export PORTAGE_BASH="${ROOT}"/tmp/bin/bash einfo "Compiling ${A%-*}" @@ -1336,10 +1337,12 @@ bootstrap_stage3() { fi fi + get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI) || echo lib; } + configure_toolchain || return 1 export CONFIG_SHELL="${ROOT}"/tmp/bin/bash export CPPFLAGS="-I${ROOT}/usr/include" - export LDFLAGS="-L${ROOT}/usr/lib" + export LDFLAGS="-L${ROOT}/usr/$(get_libdir)" unset CC CXX emerge_pkgs() {