commit: c9c48c989410c9aaf6e2cb6b0a51e6551fc97f29
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 22:47:19 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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"
