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 664CA138330 for ; Mon, 8 Jan 2018 07:53:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABAB6E0B89; Mon, 8 Jan 2018 07:53:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C9D4E0B6F for ; Mon, 8 Jan 2018 07:53:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77C7B340FAB for ; Mon, 8 Jan 2018 07:53:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6EC71AB for ; Mon, 8 Jan 2018 07:53:11 +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: <1515397943.2b54c4011ab80275208b8859a1865a967a3782e6.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: 2b54c4011ab80275208b8859a1865a967a3782e6 X-VCS-Branch: master Date: Mon, 8 Jan 2018 07:53:11 +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: efced995-4885-4c5e-97fb-a2311ca871c1 X-Archives-Hash: 1eb82f231cf46660d3862fa9d5c63800 commit: 2b54c4011ab80275208b8859a1865a967a3782e6 Author: Benda Xu gentoo org> AuthorDate: Mon Jan 8 07:29:58 2018 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Jan 8 07:52:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2b54c401 scripts/bootstrap-prefix.sh: remove TPREFIX logic. stage2 linker should search for host libraries by default. scripts/bootstrap-prefix.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index d38790b1b8..f64409e89e 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1412,6 +1412,12 @@ bootstrap_stage2() { # stage and rather have it continue instead of abort the build export MAKEINFO="echo makeinfo GNU texinfo 4.13" + # Disable RAP directory hacks of binutils and gcc. If libc.so + # linker script provides no hint of ld-linux*.so*, ld should + # look into its default library path. Prefix library pathes + # are taken care of by LDFLAGS in configure_cflags(). + export BOOTSTRAP_RAP_STAGE2=yes + # Build a basic compiler and portage dependencies in $ROOT/tmp. pkgs=( sys-apps/gentoo-functions @@ -1435,10 +1441,7 @@ bootstrap_stage2() { emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - # Build a linker and compiler that live in ${ROOT}/tmp, but - # produce binaries in ${ROOT}. Debian multiarch supported by RAP - # needs ld to support sysroot. - TPREFIX="${ROOT}" \ + # Debian multiarch supported by RAP needs ld to support sysroot. EXTRA_ECONF=$(rapx --with-sysroot=/) \ emerge_pkgs --nodeps ${linker} || return 1 @@ -1450,11 +1453,11 @@ bootstrap_stage2() { # unless we only build the buildtool, bug #603012 echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use - BOOTSTRAP_RAP_STAGE2=yes \ - EXTRA_ECONF="--disable-bootstrap" \ - MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \ + #