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

[Michael Haubenwallner]

commit:     69693f3801f660315eae75a17e3877d569891032
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 11:22:55 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu May 24 11:22:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=69693f38

bootstrap-prefix.sh(stage3 PREROOTPATH): /usr/bin before /bin

When /bin is before /usr/bin and /bin is symlinked to /usr/bin, then
python3 does locate itself in /bin, resulting in python3 header files
location in (the not existing) /include rather than /usr/include.

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 45e1d23f57..77ec59e3bf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1634,7 +1634,7 @@ bootstrap_stage3() {
                # stage3 tools should be used first.
                # PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
                # needed with host portage.
-               PREROOTPATH="${ROOT}"$(echo 
/{,tmp/}{,usr/}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \
+               PREROOTPATH="${ROOT}"$(echo 
/{,tmp/}{usr/,}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \
                EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
                FEATURES="${FEATURES} force-prefix" \
                EMERGE_LOG_DIR="${ROOT}"/var/log \