Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Mon, 11 May 2020 06:59:37
Message-Id: 1589180317.772a54809044917084b4dfb38890cf77c7814fb8.heroxbd@gentoo
1 commit: 772a54809044917084b4dfb38890cf77c7814fb8
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 9 08:07:02 2020 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Mon May 11 06:58:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=772a5480
7
8 bootstrap-prefix.sh: disable stage3 gcc bootstrap for RAP
9
10 stage2 glibc is incompatible with that of stage3. gcc bootstrap does
11 not handle this situation correctly.
12
13 During bootstrap src_compile(), it passes libstdc++ of new glibc by
14 LD_LIBRARY_PATH to work with g++ of stage2, resulting in symbol
15 conflicts at lease on CentOS 7.
16
17 The call of `emerge -e @system` will finally build a gcc in bootstrap
18 mode.
19
20 Reported-by: huiyiqun, jsteward
21 Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
22
23 scripts/bootstrap-prefix.sh | 3 ++-
24 1 file changed, 2 insertions(+), 1 deletion(-)
25
26 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
27 index 3e36df7396..ab57d62419 100755
28 --- a/scripts/bootstrap-prefix.sh
29 +++ b/scripts/bootstrap-prefix.sh
30 @@ -1981,7 +1981,8 @@ bootstrap_stage3() {
31 fi
32
33 # try to get ourself out of the mudd, bug #575324
34 - EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
35 + EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \
36 + GCC_MAKE_TARGET=$(rapx all) \
37 MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
38 PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
39 with_stack_emerge_pkgs --nodeps ${compiler} || return 1