| 1 |
commit: 8f04ee910e38c38f597ebebc35190140e6ffa310 |
| 2 |
Author: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 14 22:28:08 2017 +0000 |
| 4 |
Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 14 22:28:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=8f04ee91 |
| 7 |
|
| 8 |
sys-devel/crossdev: avr: disable pie, set default stage, make symlink |
| 9 |
more robust |
| 10 |
|
| 11 |
Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org> |
| 12 |
|
| 13 |
crossdev | 22 +++++++++++----------- |
| 14 |
1 file changed, 11 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/crossdev b/crossdev |
| 17 |
index 048f82a..7fdb3e3 100755 |
| 18 |
--- a/crossdev |
| 19 |
+++ b/crossdev |
| 20 |
@@ -224,12 +224,14 @@ parse_target() { |
| 21 |
# this is a linux+ target, not microcontroller (below) |
| 22 |
avr32*) :;; |
| 23 |
|
| 24 |
- avr*) KPKG="[none]"; |
| 25 |
- LCAT="dev-embedded"; LPKG="avr-libc"; |
| 26 |
- GUSE="-fortran -go" # doesn't work |
| 27 |
+ avr*) KPKG="[none]" |
| 28 |
+ LCAT="dev-embedded" |
| 29 |
+ LPKG="avr-libc" |
| 30 |
+ GUSE="-fortran -go -pie nopie" # doesn't work |
| 31 |
MULTILIB_USE="yes" #377039 |
| 32 |
- WITH_DEF_HEADERS="no" |
| 33 |
- MAKE_SYMLINK="yes";; |
| 34 |
+ STAGE_DEFAULT=${STAGE_LIBC} |
| 35 |
+ MAKE_SYMLINK="yes" |
| 36 |
+ WITH_DEF_HEADERS="no";; |
| 37 |
|
| 38 |
# due to upstream lameness, build C/C++ at first glance |
| 39 |
*-cygwin) |
| 40 |
@@ -1027,15 +1029,13 @@ set_portage() { |
| 41 |
case ${CTARGET} in |
| 42 |
# avr requires multilib, that provides |
| 43 |
# libgcc for all sub-architectures #378387 |
| 44 |
- avr*) set_use_force ${pkg} multilib |
| 45 |
- ;; |
| 46 |
- *) set_use_force ${pkg} -multilib |
| 47 |
- ;; |
| 48 |
+ avr*) set_use_force ${pkg} multilib; |
| 49 |
+ set_use_mask ${pkg} -multilib;; |
| 50 |
+ *) set_use_force ${pkg} -multilib;; |
| 51 |
esac |
| 52 |
|
| 53 |
set_keywords ${pkg} ${ver} |
| 54 |
set_use ${pkg} ${use} |
| 55 |
- set_use_mask ${pkg} -multilib |
| 56 |
set_links ${cat} ${pkg} "${ovl}" |
| 57 |
set_env ${l} ${pkg} "${env}" |
| 58 |
} |
| 59 |
@@ -1297,7 +1297,7 @@ if ! ex_fast ; then |
| 60 |
# this is to make sure that avr linker can find its a**, er, ldscripts |
| 61 |
if [[ ${MAKE_SYMLINK} == "yes" ]] ; then |
| 62 |
case ${CTARGET} in |
| 63 |
- avr*) [[ -e ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] || \ |
| 64 |
+ avr*) ( ! [[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && [[ -d ${EPREFIX}/usr/${CTARGET}/lib ]] ) && \ |
| 65 |
ln -s ${EPREFIX}/usr/$CHOST/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/ |
| 66 |
;; |
| 67 |
*) ;; |
Archives