1 |
dirtyepic 13/12/23 21:41:19 |
2 |
|
3 |
Modified: ChangeLog toolchain.eclass |
4 |
Log: |
5 |
Rename gtk USE flag to awt. Remove lto USE flag. Minor cleanup. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1086 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1086&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1086&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1085&r2=1.1086 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1085 |
18 |
retrieving revision 1.1086 |
19 |
diff -u -r1.1085 -r1.1086 |
20 |
--- ChangeLog 21 Dec 2013 20:11:55 -0000 1.1085 |
21 |
+++ ChangeLog 23 Dec 2013 21:41:19 -0000 1.1086 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1085 2013/12/21 20:11:55 pesa Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1086 2013/12/23 21:41:19 dirtyepic Exp $ |
27 |
+ |
28 |
+ 23 Dec 2013; Ryan Hill <dirtyepic@g.o> toolchain.eclass: |
29 |
+ Rename gtk USE flag to awt. Remove lto USE flag. Minor cleanup. |
30 |
|
31 |
21 Dec 2013; Davide Pesavento <pesa@g.o> qt4-r2.eclass: |
32 |
Use eqmake4() from qmake-utils.eclass |
33 |
|
34 |
|
35 |
|
36 |
1.609 eclass/toolchain.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.609&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.609&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.608&r2=1.609 |
41 |
|
42 |
Index: toolchain.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
45 |
retrieving revision 1.608 |
46 |
retrieving revision 1.609 |
47 |
diff -u -r1.608 -r1.609 |
48 |
--- toolchain.eclass 21 Dec 2013 11:59:18 -0000 1.608 |
49 |
+++ toolchain.eclass 23 Dec 2013 21:41:19 -0000 1.609 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2013 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.608 2013/12/21 11:59:18 dirtyepic Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.609 2013/12/23 21:41:19 dirtyepic Exp $ |
55 |
|
56 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
57 |
|
58 |
@@ -9,7 +9,7 @@ |
59 |
LICENSE="GPL-2 LGPL-2.1" |
60 |
RESTRICT="strip" # cross-compilers need controlled stripping |
61 |
|
62 |
-inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils |
63 |
+inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator |
64 |
|
65 |
if [[ ${PV} == *_pre9999* ]] ; then |
66 |
EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git" |
67 |
@@ -79,6 +79,7 @@ |
68 |
fi |
69 |
|
70 |
export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}} |
71 |
+ |
72 |
PREFIX=${TOOLCHAIN_PREFIX:-/usr} |
73 |
|
74 |
if tc_version_is_at_least 3.4.0 ; then |
75 |
@@ -110,14 +111,13 @@ |
76 |
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" |
77 |
[[ -n ${D_VER} ]] && IUSE+=" d" |
78 |
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp" |
79 |
- tc_version_is_at_least 3 && IUSE+=" doc gcj gtk hardened multilib objc" |
80 |
+ tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc" |
81 |
tc_version_is_at_least 4.0 && IUSE+=" objc-gc" |
82 |
tc_version_is_at_least 4.0 && ! tc_version_is_at_least 4.9 && IUSE+=" mudflap" |
83 |
tc_version_is_at_least 4.1 && IUSE+=" libssp objc++" |
84 |
tc_version_is_at_least 4.2 && IUSE+=" openmp" |
85 |
tc_version_is_at_least 4.3 && IUSE+=" fixed-point" |
86 |
tc_version_is_at_least 4.6 && IUSE+=" graphite" |
87 |
- tc_version_is_at_least 4.6 && IUSE+=" lto" |
88 |
tc_version_is_at_least 4.7 && IUSE+=" go" |
89 |
fi |
90 |
|
91 |
@@ -187,7 +187,7 @@ |
92 |
" |
93 |
tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango" |
94 |
tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip" |
95 |
- DEPEND+=" gcj? ( gtk? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )" |
96 |
+ DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )" |
97 |
fi |
98 |
|
99 |
PDEPEND=">=sys-devel/gcc-config-1.7" |
100 |
@@ -340,8 +340,12 @@ |
101 |
"in your make.conf if you want to use this version." |
102 |
fi |
103 |
|
104 |
+ [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && \ |
105 |
+ die "Sorry, this version does not support uClibc" |
106 |
+ |
107 |
# we dont want to use the installed compiler's specs to build gcc! |
108 |
unset GCC_SPECS |
109 |
+ unset LANGUAGES #265283 |
110 |
|
111 |
if ! use_if_iuse cxx ; then |
112 |
use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"' |
113 |
@@ -350,16 +354,11 @@ |
114 |
fi |
115 |
|
116 |
want_minispecs |
117 |
- |
118 |
- unset LANGUAGES #265283 |
119 |
} |
120 |
|
121 |
#----> src_unpack <---- |
122 |
|
123 |
toolchain_src_unpack() { |
124 |
- [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && \ |
125 |
- die "Sorry, this version does not support uClibc" |
126 |
- |
127 |
if [[ ${PV} == *9999* ]]; then |
128 |
git-2_src_unpack |
129 |
else |
130 |
@@ -438,7 +437,7 @@ |
131 |
|
132 |
# disable --as-needed from being compiled into gcc specs |
133 |
# natively when using a gcc version < 3.4.4 |
134 |
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 |
135 |
+ # http://gcc.gnu.org/PR14992 |
136 |
if ! tc_version_is_at_least 3.4.4 ; then |
137 |
sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in |
138 |
fi |
139 |
@@ -463,8 +462,6 @@ |
140 |
# update configure files |
141 |
local f |
142 |
einfo "Fixing misc issues in configure files" |
143 |
- # TODO - check if we can drop this now that we don't gen info files |
144 |
- tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch |
145 |
for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do |
146 |
ebegin " Updating ${f/${S}\/} [LANG]" |
147 |
patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \ |
148 |
@@ -513,7 +510,7 @@ |
149 |
ebegin "Adding support for the D language" |
150 |
./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log |
151 |
if ! eend $? ; then |
152 |
- eerror "The D gcc package failed to apply" |
153 |
+ eerror "The D GCC package failed to apply" |
154 |
eerror "Please include this log file when posting a bug report:" |
155 |
eerror " ${T}/dgcc.log" |
156 |
die "failed to include the D language" |
157 |
@@ -729,8 +726,6 @@ |
158 |
gcc_do_filter_flags() { |
159 |
strip-flags |
160 |
|
161 |
- # In general gcc does not like optimization, and adds -O2 where |
162 |
- # it is safe. This is especially true for gcc 3.3 + 3.4 |
163 |
replace-flags -O? -O2 |
164 |
|
165 |
# dont want to funk ourselves |
166 |
@@ -801,24 +796,6 @@ |
167 |
|
168 |
strip-unsupported-flags |
169 |
|
170 |
- # CFLAGS logic (verified with 3.4.3): |
171 |
- # CFLAGS: |
172 |
- # This conflicts when creating a crosscompiler, so set to a sane |
173 |
- # default in this case: |
174 |
- # used in ./configure and elsewhere for the native compiler |
175 |
- # used by gcc when creating libiberty.a |
176 |
- # used by xgcc when creating libstdc++ (and probably others)! |
177 |
- # this behavior should be removed... |
178 |
- # |
179 |
- # CXXFLAGS: |
180 |
- # used by xgcc when creating libstdc++ |
181 |
- # |
182 |
- # STAGE1_CFLAGS (not used in creating a crosscompile gcc): |
183 |
- # used by ${CHOST}-gcc for building stage1 compiler |
184 |
- # |
185 |
- # BOOT_CFLAGS (not used in creating a crosscompile gcc): |
186 |
- # used by xgcc for building stage2/3 compiler |
187 |
- |
188 |
if is_crosscompile ; then |
189 |
# Set this to something sane for both native and target |
190 |
CFLAGS="-O2 -pipe" |
191 |
@@ -924,7 +901,7 @@ |
192 |
|
193 |
# Branding |
194 |
tc_version_is_at_least 4.3 && confgcc+=( |
195 |
- --with-bugurl=http://bugs.gentoo.org/ |
196 |
+ --with-bugurl=https://bugs.gentoo.org/ |
197 |
--with-pkgversion="${BRANDING_GCC_PKGVERSION}" |
198 |
) |
199 |
|
200 |
@@ -1148,7 +1125,7 @@ |
201 |
|
202 |
if ! is_gcj ; then |
203 |
confgcc+=( --disable-libgcj ) |
204 |
- elif use gtk ; then |
205 |
+ elif use awt ; then |
206 |
confgcc+=( --enable-java-awt=gtk ) |
207 |
fi |
208 |
|
209 |
@@ -1195,7 +1172,7 @@ |
210 |
fi |
211 |
|
212 |
if tc_version_is_at_least 4.6 ; then |
213 |
- confgcc+=( $(use_enable lto) ) |
214 |
+ confgcc+=( --enable-lto ) |
215 |
elif tc_version_is_at_least 4.5 ; then |
216 |
confgcc+=( --disable-lto ) |
217 |
fi |
218 |
@@ -1302,6 +1279,7 @@ |
219 |
gcc_do_filter_flags |
220 |
einfo "CFLAGS=\"${CFLAGS}\"" |
221 |
einfo "CXXFLAGS=\"${CXXFLAGS}\"" |
222 |
+ einfo "LDFLAGS=\"${LDFLAGS}\"" |
223 |
|
224 |
# Force internal zip based jar script to avoid random |
225 |
# issues with 3rd party jar implementations. #384291 |