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 7C4E21381F3 for ; Sat, 30 Dec 2017 22:52:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDED3E08AD; Sat, 30 Dec 2017 22:52:20 +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 8BB54E08AD for ; Sat, 30 Dec 2017 22:52:20 +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 8F6B6335C2E for ; Sat, 30 Dec 2017 22:52:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29CFE145 for ; Sat, 30 Dec 2017 22:52:17 +0000 (UTC) From: "Mike Gilbert" 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 Gilbert" Message-ID: <1514674195.c9c48c989410c9aaf6e2cb6b0a51e6551fc97f29.floppym@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-r3.ebuild sys-devel/binutils-config/binutils-config-5-r4.ebuild sys-devel/binutils-config/binutils-config-5.1-r1.ebuild sys-devel/binutils-config/binutils-config-5.1.ebuild sys-devel/binutils-config/files/binutils-config-5 sys-devel/binutils-config/files/binutils-config-5.1 X-VCS-Directories: sys-devel/binutils-config/files/ sys-devel/binutils-config/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c9c48c989410c9aaf6e2cb6b0a51e6551fc97f29 X-VCS-Branch: master Date: Sat, 30 Dec 2017 22:52:17 +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: 3924cd36-0cfb-4f2f-8887-23256e0aac22 X-Archives-Hash: e62d1cc530a489c912144a1997c4934c commit: c9c48c989410c9aaf6e2cb6b0a51e6551fc97f29 Author: Mike Gilbert gentoo org> AuthorDate: Sat Dec 30 22:47:19 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Dec 30 22:49:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c48c98 Revert "sys-devel/binutils-config: add avr/msp symlink handling" This reverts commit 1b129b82462191f6adf022a2327d5b3a72dcb893. This change caused symlinks to go missing under /usr/${CTARGET}/lib for "normal" cross toolchains. Anothoer solution is needed for avr/msp. Closes: https://bugs.gentoo.org/642738 .../{binutils-config-5-r3.ebuild => binutils-config-5-r4.ebuild} | 0 .../{binutils-config-5.1.ebuild => binutils-config-5.1-r1.ebuild} | 0 sys-devel/binutils-config/files/binutils-config-5 | 8 ++------ sys-devel/binutils-config/files/binutils-config-5.1 | 6 +----- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sys-devel/binutils-config/binutils-config-5-r3.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild similarity index 100% rename from sys-devel/binutils-config/binutils-config-5-r3.ebuild rename to sys-devel/binutils-config/binutils-config-5-r4.ebuild diff --git a/sys-devel/binutils-config/binutils-config-5.1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild similarity index 100% rename from sys-devel/binutils-config/binutils-config-5.1.ebuild rename to sys-devel/binutils-config/binutils-config-5.1-r1.ebuild diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5 index e6c5fac0026..acb72b7e343 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-2017 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Format of /etc/env.d/binutils/: @@ -145,17 +145,13 @@ 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, except - # we can't for bare-metal toolchains, so... bug #147155 + # TODO: Stop requiring even the ldscripts symlink. mkdir -p "${dstlib}" rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" diff --git a/sys-devel/binutils-config/files/binutils-config-5.1 b/sys-devel/binutils-config/files/binutils-config-5.1 index 945295c3e3a..ec06d47c14a 100644 --- a/sys-devel/binutils-config/files/binutils-config-5.1 +++ b/sys-devel/binutils-config/files/binutils-config-5.1 @@ -145,17 +145,13 @@ 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, except - # we can't for bare-metal toolchains, so... bug #147155 + # TODO: Stop requiring even the ldscripts symlink. mkdir -p "${dstlib}" rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"