From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8320E1384B4 for ; Mon, 23 Nov 2015 10:23:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CFEE21C088; Mon, 23 Nov 2015 10:23:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE51321C088 for ; Mon, 23 Nov 2015 10:23:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05C3634073B for ; Mon, 23 Nov 2015 10:23:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F19D1069 for ; Mon, 23 Nov 2015 10:23:06 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1448274118.7fbeab2ed7339b602b134a2bba4016e977266a54.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-config/files/, sys-devel/binutils-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/binutils-config/binutils-config-5-r1.ebuild sys-devel/binutils-config/binutils-config-5-r2.ebuild sys-devel/binutils-config/files/binutils-config-5 X-VCS-Directories: sys-devel/binutils-config/files/ sys-devel/binutils-config/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 7fbeab2ed7339b602b134a2bba4016e977266a54 X-VCS-Branch: master Date: Mon, 23 Nov 2015 10:23:06 +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: 3a0f478a-237b-4bb4-aa93-105910f0e33a X-Archives-Hash: 760cd95b11fc81662381ab5d8f3fb21d commit: 7fbeab2ed7339b602b134a2bba4016e977266a54 Author: Mike Frysinger gentoo org> AuthorDate: Mon Nov 23 10:19:00 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Nov 23 10:21:58 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbeab2e sys-devel/binutils-config: detect broken cross-compiler rpaths #562460 We've fixed newer cross-binutils builds to use the correct rpaths to find their internal libs, but existing builds remain broken. Add some logic to detect & warn users, but also create the old symlinks so they keep working. ...inutils-config-5-r1.ebuild => binutils-config-5-r2.ebuild} | 0 sys-devel/binutils-config/files/binutils-config-5 | 11 ++++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys-devel/binutils-config/binutils-config-5-r1.ebuild b/sys-devel/binutils-config/binutils-config-5-r2.ebuild similarity index 100% rename from sys-devel/binutils-config/binutils-config-5-r1.ebuild rename to sys-devel/binutils-config/binutils-config-5-r2.ebuild diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5 index 86f6abc..2bdd07e 100755 --- a/sys-devel/binutils-config/files/binutils-config-5 +++ b/sys-devel/binutils-config/files/binutils-config-5 @@ -149,7 +149,16 @@ switch_profile() { mkdir -p "${dstlib}" rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" - find -L "${dstlib}" -xtype l -name 'lib*' -exec rm -f {} + + find -L "${dstlib}" -xtype l -name 'lib*' -delete + # Detect older binutils w/broken rpaths. #562460 + # We can hardcode the "/lib" part since that's what the binutils + # configure scripts have. They did not include any other path. + if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then + ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)." + for x in lib* ; do + atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}" + done + fi # # Clean out old generated include symlinks