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 7D4B91396DC for ; Fri, 13 Oct 2017 16:31:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90ADBE0BCB; Fri, 13 Oct 2017 16:31:45 +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 6AD24E0B4B for ; Fri, 13 Oct 2017 16:31:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 54EE433C1EB for ; Fri, 13 Oct 2017 16:31:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B46C290A8 for ; Fri, 13 Oct 2017 16:31:42 +0000 (UTC) From: "Steve Arnold" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Steve Arnold" Message-ID: <1507870018.03640757f2af1471324fc3e305f899f377d6409d.nerdboy@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev X-VCS-Directories: / X-VCS-Committer: nerdboy X-VCS-Committer-Name: Steve Arnold X-VCS-Revision: 03640757f2af1471324fc3e305f899f377d6409d X-VCS-Branch: master Date: Fri, 13 Oct 2017 16:31:42 +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: 9823ffc7-2c7b-4c8e-a439-9188caa3a13c X-Archives-Hash: 8e0e07a7307bd4e1d703f6d31db1fef2 commit: 03640757f2af1471324fc3e305f899f377d6409d Author: Steve Arnold gentoo org> AuthorDate: Fri Oct 13 04:46:58 2017 +0000 Commit: Steve Arnold gentoo org> CommitDate: Fri Oct 13 04:46:58 2017 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=03640757 sys-devel/crossdev: add one more avr-specific hack * link ldscripts to the right place (parameterized and expandable even) Signed-off-by: Steve Arnold gentoo.org> crossdev | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/crossdev b/crossdev index 78d63da..8ba0360 100755 --- a/crossdev +++ b/crossdev @@ -228,7 +228,8 @@ parse_target() { LCAT="dev-embedded"; LPKG="avr-libc"; GUSE="-fortran -go" # doesn't work MULTILIB_USE="yes" #377039 - WITH_DEF_HEADERS="no";; + WITH_DEF_HEADERS="no" + MAKE_SYMLINK="yes";; # due to upstream lameness, build C/C++ at first glance *-cygwin) @@ -449,6 +450,7 @@ 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} + [[ -e ${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}" @@ -1291,7 +1293,15 @@ if ! ex_fast ; then USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \ doemerge ${GPKG} ${GPKG}-stage2 fi +fi +# this is to make sure that avr linker can find its a**, er, ldscripts +if [[ ${MAKE_SYMLINK} == "yes" ]] ; then + case ${CTARGET} in + avr*) ln -s ${EPREFIX}/usr/$CHOST/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/ldscripts + ;; + *) ;; + esac fi # all the extra things (like debuggers)