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 F3B8C1396D9 for ; Sat, 14 Oct 2017 23:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3668B2BC025; Sat, 14 Oct 2017 23:46:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 EE7FF2BC025 for ; Sat, 14 Oct 2017 23:46:18 +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 39DDF33BF24 for ; Sat, 14 Oct 2017 23:46:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A131D30F for ; Sat, 14 Oct 2017 23:46:15 +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: <1508020088.8f04ee910e38c38f597ebebc35190140e6ffa310.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: 8f04ee910e38c38f597ebebc35190140e6ffa310 X-VCS-Branch: master Date: Sat, 14 Oct 2017 23:46:15 +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: b1206230-30fc-4c55-be8a-91bc00313763 X-Archives-Hash: 77e525c1e5e31c99aeb8cad071ec5fe3 commit: 8f04ee910e38c38f597ebebc35190140e6ffa310 Author: Steve Arnold gentoo org> AuthorDate: Sat Oct 14 22:28:08 2017 +0000 Commit: Steve Arnold gentoo org> CommitDate: Sat Oct 14 22:28:08 2017 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=8f04ee91 sys-devel/crossdev: avr: disable pie, set default stage, make symlink more robust Signed-off-by: Steve Arnold gentoo.org> crossdev | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/crossdev b/crossdev index 048f82a..7fdb3e3 100755 --- a/crossdev +++ b/crossdev @@ -224,12 +224,14 @@ parse_target() { # this is a linux+ target, not microcontroller (below) avr32*) :;; - avr*) KPKG="[none]"; - LCAT="dev-embedded"; LPKG="avr-libc"; - GUSE="-fortran -go" # doesn't work + avr*) KPKG="[none]" + LCAT="dev-embedded" + LPKG="avr-libc" + GUSE="-fortran -go -pie nopie" # doesn't work MULTILIB_USE="yes" #377039 - WITH_DEF_HEADERS="no" - MAKE_SYMLINK="yes";; + STAGE_DEFAULT=${STAGE_LIBC} + MAKE_SYMLINK="yes" + WITH_DEF_HEADERS="no";; # due to upstream lameness, build C/C++ at first glance *-cygwin) @@ -1027,15 +1029,13 @@ set_portage() { case ${CTARGET} in # avr requires multilib, that provides # libgcc for all sub-architectures #378387 - avr*) set_use_force ${pkg} multilib - ;; - *) set_use_force ${pkg} -multilib - ;; + avr*) set_use_force ${pkg} multilib; + set_use_mask ${pkg} -multilib;; + *) set_use_force ${pkg} -multilib;; esac set_keywords ${pkg} ${ver} set_use ${pkg} ${use} - set_use_mask ${pkg} -multilib set_links ${cat} ${pkg} "${ovl}" set_env ${l} ${pkg} "${env}" } @@ -1297,7 +1297,7 @@ if ! ex_fast ; then # this is to make sure that avr linker can find its a**, er, ldscripts if [[ ${MAKE_SYMLINK} == "yes" ]] ; then case ${CTARGET} in - avr*) [[ -e ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] || \ + avr*) ( ! [[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && [[ -d ${EPREFIX}/usr/${CTARGET}/lib ]] ) && \ ln -s ${EPREFIX}/usr/$CHOST/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/ ;; *) ;;