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 BA2AA138330 for ; Sat, 13 Jan 2018 09:16:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E63EAE0883; Sat, 13 Jan 2018 09:16:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C1C65E087F for ; Sat, 13 Jan 2018 09:16:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 56D8B335C48 for ; Sat, 13 Jan 2018 09:16:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E07AD197 for ; Sat, 13 Jan 2018 09:16:35 +0000 (UTC) From: "Fabian Groffen" 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" Message-ID: <1515827734.8d5da8b108eb27a66f659c509a07bb3aab1839a6.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: 8d5da8b108eb27a66f659c509a07bb3aab1839a6 X-VCS-Branch: master Date: Sat, 13 Jan 2018 09:16:35 +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: 6ba248cf-f597-4982-bed2-2d1f9c7244ed X-Archives-Hash: f29710036c938e6c46bb97d915bde4e8 commit: 8d5da8b108eb27a66f659c509a07bb3aab1839a6 Author: Fabian Groffen gentoo org> AuthorDate: Sat Jan 13 07:15:34 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jan 13 07:15:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8d5da8b1 scripts/bootstrap-prefix: also add rpath entries for special libdir without this, at least on sparcv9 solaris 10 python won't start because it can't find 64-bit libgcc_s.1.so scripts/bootstrap-prefix.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 02c7e45148..d5cad4d148 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -880,11 +880,13 @@ EOP case $CHOST in *-linux*) # GNU ld - export LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}" + LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}" + LDFLAGS="${LDFLAGS} -Wl,-rpath,${libdir#-L}" ;; *-solaris*) # Sun ld - export LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib ${libdir}" + LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib ${libdir}" + LDFLAGS="${LDFLAGS} -R${libdir#-L}" ;; esac