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 3C25F1382C5 for ; Sat, 7 Apr 2018 10:56:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56A2DE0866; Sat, 7 Apr 2018 10:56:19 +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 2FDF6E0866 for ; Sat, 7 Apr 2018 10:56:19 +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 E1F60335C61 for ; Sat, 7 Apr 2018 10:56:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 211A126D for ; Sat, 7 Apr 2018 10:56:16 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1523098271.cb22827620f16f8e29fdeb3654a7e5a846af517e.slyfox@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev X-VCS-Directories: / X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: cb22827620f16f8e29fdeb3654a7e5a846af517e X-VCS-Branch: master Date: Sat, 7 Apr 2018 10:56:16 +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: 056bbd3e-1f1c-4949-a509-96ecac293038 X-Archives-Hash: 68cf599bf70e4c58e3afec911cacde77 commit: cb22827620f16f8e29fdeb3654a7e5a846af517e Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Apr 7 10:51:11 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Apr 7 10:51:11 2018 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=cb228276 crossdev: revert ldscripts hack Commit 03640757f2af1471324fc3e305f899f377d6409d ("add one more avr-specific hack") added ${EPREFIX}/usr/${CTARGET}/lib/ldscripts symlink for avr targets. The bug was not avr-specific but manifested only on avr ecause it's one of rare targets that don't embed default inker scripts intofinal ld executable. https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b023986de7d466d361798bae98f45f8ba7a42e8a fixed search path in binutils ebuild and we are safe to revert this change. Bug: https://bugs.gentoo.org/147155 Signed-off-by: Sergei Trofimovich gentoo.org> crossdev | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/crossdev b/crossdev index a646158..0f64235 100755 --- a/crossdev +++ b/crossdev @@ -232,7 +232,6 @@ parse_target() { MULTILIB_USE="yes" #377039 BUSE+=" cxx" STAGE_DEFAULT=${STAGE_LIBC} - MAKE_SYMLINK="yes" WITH_DEF_HEADERS="no";; # Has no glibc support yet (or even ABI defined). Can @@ -549,7 +548,6 @@ uninstall() { # clean out files from crossdev itself [[ -e ${EPREFIX}/var/db/pkg/cross-${CTARGET} ]] && rmdir "${EPREFIX}"/var/db/pkg/cross-${CTARGET} rm -f "${EPREFIX}"/usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} "${EPREFIX}"/usr/bin/emerge-${CTARGET} - [[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && rm "${EPREFIX}"/usr/${CTARGET}/lib/ldscripts for f in make.{conf,globals,profile} ; do f="${EPREFIX}/usr/${CTARGET}/etc/${f}" @@ -1395,16 +1393,6 @@ if ! ex_fast ; then USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \ doemerge ${GPKG} ${GPKG}-stage2 fi - - # this is to make sure that avr linker can find its a**, er, ldscripts - if [[ ${MAKE_SYMLINK} == "yes" ]] ; then - case ${CTARGET} in - avr*) ( ! [[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && [[ -d ${EPREFIX}/usr/${CTARGET}/lib ]] ) && \ - ln -s ${EPREFIX}/usr/${HCHOST}/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/ - ;; - *) ;; - esac - fi fi # all the extra things (like debuggers)