Gentoo Archives: gentoo-commits

From: Steve Arnold <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/crossdev:master commit in: /
Date: Tue, 24 Oct 2017 17:38:10
Message-Id: 1508866375.a5554b4a85fa320781af41483488cfc65d22b98c.nerdboy@gentoo
1 commit: a5554b4a85fa320781af41483488cfc65d22b98c
2 Author: Steve Arnold <nerdboy <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 24 17:32:55 2017 +0000
4 Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 24 17:32:55 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=a5554b4a
7
8 Update avr/armv7m with USE=cxx for stage4, use crossdev HCHOST variable
9
10 * upstream projects need c++, however, stage3 is still the default
11
12 Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org>
13
14 crossdev | 9 +++++----
15 1 file changed, 5 insertions(+), 4 deletions(-)
16
17 diff --git a/crossdev b/crossdev
18 index 1a0bded..0eaa721 100755
19 --- a/crossdev
20 +++ b/crossdev
21 @@ -227,8 +227,9 @@ parse_target() {
22 avr*) KPKG="[none]"
23 LCAT="dev-embedded"
24 LPKG="avr-libc"
25 - GUSE="-fortran -go -pie nopie" # doesn't work
26 + GUSE+=" -fortran -go -pie nopie" # doesn't work
27 MULTILIB_USE="yes" #377039
28 + BUSE+=" cxx"
29 STAGE_DEFAULT=${STAGE_LIBC}
30 MAKE_SYMLINK="yes"
31 WITH_DEF_HEADERS="no";;
32 @@ -306,7 +307,7 @@ parse_target() {
33 LPKG="newlib"
34 KPKG="[none]"
35 STAGE_DEFAULT=${STAGE_LIBC}
36 - GUSE+=" -openmp" #489798
37 + GUSE+=" cxx -openmp" #489798
38 MULTILIB_USE="yes" #407275
39 WITH_DEF_HEADERS="no"
40 ;;
41 @@ -1229,7 +1230,7 @@ USE="${USE} -selinux"
42 if ! ex_fast ; then
43
44 # stage 0: binutils
45 - doemerge ${BPKG}
46 + USE="${BUSE}" doemerge ${BPKG}
47
48 # stage1: bare C compiler
49 if is_s1 ; then
50 @@ -1292,7 +1293,7 @@ if ! ex_fast ; then
51 if [[ ${MAKE_SYMLINK} == "yes" ]] ; then
52 case ${CTARGET} in
53 avr*) ( ! [[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && [[ -d ${EPREFIX}/usr/${CTARGET}/lib ]] ) && \
54 - ln -s ${EPREFIX}/usr/${CHOST}/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/
55 + ln -s ${EPREFIX}/usr/${HCHOST}/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/
56 ;;
57 *) ;;
58 esac