| 1 |
commit: cb22827620f16f8e29fdeb3654a7e5a846af517e |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 7 10:51:11 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 7 10:51:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=cb228276 |
| 7 |
|
| 8 |
crossdev: revert ldscripts hack |
| 9 |
|
| 10 |
Commit 03640757f2af1471324fc3e305f899f377d6409d |
| 11 |
("add one more avr-specific hack") |
| 12 |
added ${EPREFIX}/usr/${CTARGET}/lib/ldscripts symlink for avr targets. |
| 13 |
|
| 14 |
The bug was not avr-specific but manifested only on avr ecause it's one |
| 15 |
of rare targets that don't embed default inker scripts intofinal ld executable. |
| 16 |
|
| 17 |
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b023986de7d466d361798bae98f45f8ba7a42e8a |
| 18 |
fixed search path in binutils ebuild and we are safe to revert this change. |
| 19 |
|
| 20 |
Bug: https://bugs.gentoo.org/147155 |
| 21 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 22 |
|
| 23 |
crossdev | 12 ------------ |
| 24 |
1 file changed, 12 deletions(-) |
| 25 |
|
| 26 |
diff --git a/crossdev b/crossdev |
| 27 |
index a646158..0f64235 100755 |
| 28 |
--- a/crossdev |
| 29 |
+++ b/crossdev |
| 30 |
@@ -232,7 +232,6 @@ parse_target() { |
| 31 |
MULTILIB_USE="yes" #377039 |
| 32 |
BUSE+=" cxx" |
| 33 |
STAGE_DEFAULT=${STAGE_LIBC} |
| 34 |
- MAKE_SYMLINK="yes" |
| 35 |
WITH_DEF_HEADERS="no";; |
| 36 |
|
| 37 |
# Has no glibc support yet (or even ABI defined). Can |
| 38 |
@@ -549,7 +548,6 @@ uninstall() { |
| 39 |
# clean out files from crossdev itself |
| 40 |
[[ -e ${EPREFIX}/var/db/pkg/cross-${CTARGET} ]] && rmdir "${EPREFIX}"/var/db/pkg/cross-${CTARGET} |
| 41 |
rm -f "${EPREFIX}"/usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} "${EPREFIX}"/usr/bin/emerge-${CTARGET} |
| 42 |
- [[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && rm "${EPREFIX}"/usr/${CTARGET}/lib/ldscripts |
| 43 |
|
| 44 |
for f in make.{conf,globals,profile} ; do |
| 45 |
f="${EPREFIX}/usr/${CTARGET}/etc/${f}" |
| 46 |
@@ -1395,16 +1393,6 @@ if ! ex_fast ; then |
| 47 |
USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \ |
| 48 |
doemerge ${GPKG} ${GPKG}-stage2 |
| 49 |
fi |
| 50 |
- |
| 51 |
- # this is to make sure that avr linker can find its a**, er, ldscripts |
| 52 |
- if [[ ${MAKE_SYMLINK} == "yes" ]] ; then |
| 53 |
- case ${CTARGET} in |
| 54 |
- avr*) ( ! [[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && [[ -d ${EPREFIX}/usr/${CTARGET}/lib ]] ) && \ |
| 55 |
- ln -s ${EPREFIX}/usr/${HCHOST}/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/ |
| 56 |
- ;; |
| 57 |
- *) ;; |
| 58 |
- esac |
| 59 |
- fi |
| 60 |
fi |
| 61 |
|
| 62 |
# all the extra things (like debuggers) |
Archives