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 1CBAF139083 for ; Wed, 22 Nov 2017 18:26:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F448E0DF3; Wed, 22 Nov 2017 18:26:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6EC65E0DF3 for ; Wed, 22 Nov 2017 18:26:09 +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 45758340AC7 for ; Wed, 22 Nov 2017 18:26:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9759A3E5 for ; Wed, 22 Nov 2017 18:26:06 +0000 (UTC) From: "Steve Arnold" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Steve Arnold" Message-ID: <1511375106.1b129b82462191f6adf022a2327d5b3a72dcb893.nerdboy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-config/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/binutils-config/files/binutils-config-5 X-VCS-Directories: sys-devel/binutils-config/files/ X-VCS-Committer: nerdboy X-VCS-Committer-Name: Steve Arnold X-VCS-Revision: 1b129b82462191f6adf022a2327d5b3a72dcb893 X-VCS-Branch: master Date: Wed, 22 Nov 2017 18:26: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: ad2991c0-4660-43b8-8188-46de918f7748 X-Archives-Hash: 95ceca05da808d24b0262b24f9112dc2 commit: 1b129b82462191f6adf022a2327d5b3a72dcb893 Author: Stephen L Arnold gentoo org> AuthorDate: Wed Nov 22 18:24:12 2017 +0000 Commit: Steve Arnold gentoo org> CommitDate: Wed Nov 22 18:25:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b129b82 sys-devel/binutils-config: add avr/msp symlink handling * fixes bug #147155 for all the happy arduino people Package-Manager: Portage-2.3.13, Repoman-2.3.4 sys-devel/binutils-config/files/binutils-config-5 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5 index acb72b7e343..e6c5fac0026 100755 --- a/sys-devel/binutils-config/files/binutils-config-5 +++ b/sys-devel/binutils-config/files/binutils-config-5 @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Format of /etc/env.d/binutils/: @@ -145,13 +145,17 @@ switch_profile() { cd "${ROOT}/${LIBPATH}" || exit 1 if [[ ${TARGET} == ${HOST} ]] ; then dstlib=${EROOT}/usr/${HOST}/lib + elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then + # true for at least avr and msp targets + dstlib=${EROOT}/usr/${TARGET}/lib else dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib fi # When upgrading, we need to clean up ldscripts and libs. # Don't symlink back in the libs -- the binutils-lib package handles # these now. - # TODO: Stop requiring even the ldscripts symlink. + # TODO: Stop requiring even the ldscripts symlink, except + # we can't for bare-metal toolchains, so... bug #147155 mkdir -p "${dstlib}" rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"