From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1065601-garchives=archives.gentoo.org@lists.gentoo.org>
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 53853138334
for <garchives@archives.gentoo.org>; Sun, 6 Jan 2019 11:39:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 99D9DE0C79;
Sun, 6 Jan 2019 11:38:59 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 6B2D3E0C79
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Jan 2019 11:38:59 +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 252E8335C94
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Jan 2019 11:38:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AF5B505
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Jan 2019 11:38:56 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1546774727.d327db7632339373acfb1482a29b4aa3dd92120d.grobian@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: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: d327db7632339373acfb1482a29b4aa3dd92120d
X-VCS-Branch: master
Date: Sun, 6 Jan 2019 11:38:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d70d6287-36ab-4b24-80bc-2234ff92a51b
X-Archives-Hash: fd83826b1bcae835f08bab2e6ae1a2ed
commit: d327db7632339373acfb1482a29b4aa3dd92120d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 11:38:15 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 11:38:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d327db76
scripts/bootstrap-prefix: make libgcc_s copying verbose
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 66edd753cf..e9cafdb11d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1538,13 +1538,15 @@ bootstrap_stage2() {
# this in rpath while it does find it, resulting in a runtime trap
if [[ ${CHOST} == x86_64-*-solaris* || ${CHOST} == sparcv9-*-solaris* ]] ;
then
+ local libgccs64=/usr/sfw/lib/64/libgcc_s.so.1
[[ -e ${ROOT}/tmp/usr/bin/gcc ]] || \
- cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ >& /dev/null
+ cp "${libgccs64}" "${ROOT}"/tmp/usr/lib/
# save another copy for after gcc-config gets run and removes
# usr/lib/libgcc_s.* because new links should use the compiler
- # specific libgcc_s.
+ # specific libgcc_s, but existing objs need to find this
+ # libgcc_s for as long as they are around (bash->libreadline)
LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/tmp"
- cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/tmp/ >& /dev/null
+ cp "${libgccs64}" "${ROOT}"/tmp/tmp/
fi
# Disable RAP directory hacks of binutils and gcc. If libc.so