| 1 |
commit: c9c48c989410c9aaf6e2cb6b0a51e6551fc97f29 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 30 22:47:19 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 30 22:49:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c48c98 |
| 7 |
|
| 8 |
Revert "sys-devel/binutils-config: add avr/msp symlink handling" |
| 9 |
|
| 10 |
This reverts commit 1b129b82462191f6adf022a2327d5b3a72dcb893. |
| 11 |
|
| 12 |
This change caused symlinks to go missing under /usr/${CTARGET}/lib for |
| 13 |
"normal" cross toolchains. Anothoer solution is needed for avr/msp. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/642738 |
| 16 |
|
| 17 |
.../{binutils-config-5-r3.ebuild => binutils-config-5-r4.ebuild} | 0 |
| 18 |
.../{binutils-config-5.1.ebuild => binutils-config-5.1-r1.ebuild} | 0 |
| 19 |
sys-devel/binutils-config/files/binutils-config-5 | 8 ++------ |
| 20 |
sys-devel/binutils-config/files/binutils-config-5.1 | 6 +----- |
| 21 |
4 files changed, 3 insertions(+), 11 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-devel/binutils-config/binutils-config-5-r3.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild |
| 24 |
similarity index 100% |
| 25 |
rename from sys-devel/binutils-config/binutils-config-5-r3.ebuild |
| 26 |
rename to sys-devel/binutils-config/binutils-config-5-r4.ebuild |
| 27 |
|
| 28 |
diff --git a/sys-devel/binutils-config/binutils-config-5.1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild |
| 29 |
similarity index 100% |
| 30 |
rename from sys-devel/binutils-config/binutils-config-5.1.ebuild |
| 31 |
rename to sys-devel/binutils-config/binutils-config-5.1-r1.ebuild |
| 32 |
|
| 33 |
diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5 |
| 34 |
index e6c5fac0026..acb72b7e343 100755 |
| 35 |
--- a/sys-devel/binutils-config/files/binutils-config-5 |
| 36 |
+++ b/sys-devel/binutils-config/files/binutils-config-5 |
| 37 |
@@ -1,5 +1,5 @@ |
| 38 |
#!/bin/bash |
| 39 |
-# Copyright 1999-2017 Gentoo Foundation |
| 40 |
+# Copyright 1999-2015 Gentoo Foundation |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
# Format of /etc/env.d/binutils/: |
| 44 |
@@ -145,17 +145,13 @@ switch_profile() { |
| 45 |
cd "${ROOT}/${LIBPATH}" || exit 1 |
| 46 |
if [[ ${TARGET} == ${HOST} ]] ; then |
| 47 |
dstlib=${EROOT}/usr/${HOST}/lib |
| 48 |
- elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then |
| 49 |
- # true for at least avr and msp targets |
| 50 |
- dstlib=${EROOT}/usr/${TARGET}/lib |
| 51 |
else |
| 52 |
dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib |
| 53 |
fi |
| 54 |
# When upgrading, we need to clean up ldscripts and libs. |
| 55 |
# Don't symlink back in the libs -- the binutils-lib package handles |
| 56 |
# these now. |
| 57 |
- # TODO: Stop requiring even the ldscripts symlink, except |
| 58 |
- # we can't for bare-metal toolchains, so... bug #147155 |
| 59 |
+ # TODO: Stop requiring even the ldscripts symlink. |
| 60 |
mkdir -p "${dstlib}" |
| 61 |
rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts |
| 62 |
atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" |
| 63 |
|
| 64 |
diff --git a/sys-devel/binutils-config/files/binutils-config-5.1 b/sys-devel/binutils-config/files/binutils-config-5.1 |
| 65 |
index 945295c3e3a..ec06d47c14a 100644 |
| 66 |
--- a/sys-devel/binutils-config/files/binutils-config-5.1 |
| 67 |
+++ b/sys-devel/binutils-config/files/binutils-config-5.1 |
| 68 |
@@ -145,17 +145,13 @@ switch_profile() { |
| 69 |
cd "${ROOT}/${LIBPATH}" || exit 1 |
| 70 |
if [[ ${TARGET} == ${HOST} ]] ; then |
| 71 |
dstlib=${EROOT}/usr/${HOST}/lib |
| 72 |
- elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then |
| 73 |
- # true for at least avr and msp targets |
| 74 |
- dstlib=${EROOT}/usr/${TARGET}/lib |
| 75 |
else |
| 76 |
dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib |
| 77 |
fi |
| 78 |
# When upgrading, we need to clean up ldscripts and libs. |
| 79 |
# Don't symlink back in the libs -- the binutils-lib package handles |
| 80 |
# these now. |
| 81 |
- # TODO: Stop requiring even the ldscripts symlink, except |
| 82 |
- # we can't for bare-metal toolchains, so... bug #147155 |
| 83 |
+ # TODO: Stop requiring even the ldscripts symlink. |
| 84 |
mkdir -p "${dstlib}" |
| 85 |
rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts |
| 86 |
atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" |
Archives