| 1 |
commit: 396a93ce5cbb65602468a35849df558443a59ebe |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 20 07:57:03 2018 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 20 08:00:37 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=396a93ce |
| 7 |
|
| 8 |
tandalonebootstrap-prefix.sh: Add back BOOTSTRAP_RAP for zlib. |
| 9 |
|
| 10 |
By default zlib builds several example executables, even if what we |
| 11 |
want is a library. It does not matter usually. But during stage3, |
| 12 |
after glibc and before binutils, we cannot build executable |
| 13 |
reliably. These should be disabled. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/647144 |
| 16 |
|
| 17 |
scripts/bootstrap-prefix.sh | 1 + |
| 18 |
1 file changed, 1 insertion(+) |
| 19 |
|
| 20 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 21 |
index ea7a874261..0633207d9a 100755 |
| 22 |
--- a/scripts/bootstrap-prefix.sh |
| 23 |
+++ b/scripts/bootstrap-prefix.sh |
| 24 |
@@ -1676,6 +1676,7 @@ bootstrap_stage3() { |
| 25 |
# use the new dynamic linker in place of rpath from now on. |
| 26 |
RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9]) |
| 27 |
export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}" |
| 28 |
+ BOOTSTRAP_RAP=yes \ |
| 29 |
emerge_pkgs --nodeps "${pkgs[@]}" || return 1 |
| 30 |
|
| 31 |
# remove stage2 ld so that stage3 ld is used by stage2 gcc. |
Archives