| 1 |
commit: 2b54c4011ab80275208b8859a1865a967a3782e6 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 8 07:29:58 2018 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 07:52:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2b54c401 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix.sh: remove TPREFIX logic. |
| 9 |
|
| 10 |
stage2 linker should search for host libraries by default. |
| 11 |
|
| 12 |
scripts/bootstrap-prefix.sh | 19 +++++++++++-------- |
| 13 |
1 file changed, 11 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 16 |
index d38790b1b8..f64409e89e 100755 |
| 17 |
--- a/scripts/bootstrap-prefix.sh |
| 18 |
+++ b/scripts/bootstrap-prefix.sh |
| 19 |
@@ -1412,6 +1412,12 @@ bootstrap_stage2() { |
| 20 |
# stage and rather have it continue instead of abort the build |
| 21 |
export MAKEINFO="echo makeinfo GNU texinfo 4.13" |
| 22 |
|
| 23 |
+ # Disable RAP directory hacks of binutils and gcc. If libc.so |
| 24 |
+ # linker script provides no hint of ld-linux*.so*, ld should |
| 25 |
+ # look into its default library path. Prefix library pathes |
| 26 |
+ # are taken care of by LDFLAGS in configure_cflags(). |
| 27 |
+ export BOOTSTRAP_RAP_STAGE2=yes |
| 28 |
+ |
| 29 |
# Build a basic compiler and portage dependencies in $ROOT/tmp. |
| 30 |
pkgs=( |
| 31 |
sys-apps/gentoo-functions |
| 32 |
@@ -1435,10 +1441,7 @@ bootstrap_stage2() { |
| 33 |
|
| 34 |
emerge_pkgs --nodeps "${pkgs[@]}" || return 1 |
| 35 |
|
| 36 |
- # Build a linker and compiler that live in ${ROOT}/tmp, but |
| 37 |
- # produce binaries in ${ROOT}. Debian multiarch supported by RAP |
| 38 |
- # needs ld to support sysroot. |
| 39 |
- TPREFIX="${ROOT}" \ |
| 40 |
+ # Debian multiarch supported by RAP needs ld to support sysroot. |
| 41 |
EXTRA_ECONF=$(rapx --with-sysroot=/) \ |
| 42 |
emerge_pkgs --nodeps ${linker} || return 1 |
| 43 |
|
| 44 |
@@ -1450,11 +1453,11 @@ bootstrap_stage2() { |
| 45 |
# unless we only build the buildtool, bug #603012 |
| 46 |
echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use |
| 47 |
|
| 48 |
- BOOTSTRAP_RAP_STAGE2=yes \ |
| 49 |
- EXTRA_ECONF="--disable-bootstrap" \ |
| 50 |
- MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \ |
| 51 |
+ # <glibc-2.5 does not understand .gnu.hash, use |
| 52 |
+ # --hash-style=both to produce also sysv hash. |
| 53 |
+ EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both)" \ |
| 54 |
+ MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \ |
| 55 |
GCC_MAKE_TARGET=all \ |
| 56 |
- TPREFIX="${ROOT}" \ |
| 57 |
PYTHON_COMPAT_OVERRIDE=python2.7 \ |
| 58 |
emerge_pkgs --nodeps ${compiler_stage1} || return 1 |
Archives