1 |
dirtyepic 13/12/28 08:11:41 |
2 |
|
3 |
Modified: ChangeLog toolchain.eclass |
4 |
Log: |
5 |
Add tc_version_is_between() helper. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1096 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1096&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1096&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1095&r2=1.1096 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1095 |
18 |
retrieving revision 1.1096 |
19 |
diff -u -r1.1095 -r1.1096 |
20 |
--- ChangeLog 28 Dec 2013 03:48:25 -0000 1.1095 |
21 |
+++ ChangeLog 28 Dec 2013 08:11:41 -0000 1.1096 |
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.1095 2013/12/28 03:48:25 dirtyepic Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1096 2013/12/28 08:11:41 dirtyepic Exp $ |
27 |
+ |
28 |
+ 28 Dec 2013; Ryan Hill <dirtyepic@g.o> toolchain.eclass: |
29 |
+ Add tc_version_is_between() helper. |
30 |
|
31 |
28 Dec 2013; Ryan Hill <dirtyepic@g.o> toolchain.eclass: |
32 |
Reintroduce texinfo patch to unbreak older versions (bug #496224). |
33 |
|
34 |
|
35 |
|
36 |
1.613 eclass/toolchain.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.613&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.613&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.612&r2=1.613 |
41 |
|
42 |
Index: toolchain.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
45 |
retrieving revision 1.612 |
46 |
retrieving revision 1.613 |
47 |
diff -u -r1.612 -r1.613 |
48 |
--- toolchain.eclass 28 Dec 2013 03:48:25 -0000 1.612 |
49 |
+++ toolchain.eclass 28 Dec 2013 08:11:41 -0000 1.613 |
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.612 2013/12/28 03:48:25 dirtyepic Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.613 2013/12/28 08:11:41 dirtyepic Exp $ |
55 |
|
56 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
57 |
|
58 |
@@ -51,11 +51,16 @@ |
59 |
} |
60 |
|
61 |
# General purpose version check. Without a second arg matches up to minor version (x.x.x) |
62 |
-# (ie. 4.6.0_pre9999 matches 4 or 4.6 or 4.6.0 but not 4.6.1) |
63 |
tc_version_is_at_least() { |
64 |
version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}" |
65 |
} |
66 |
|
67 |
+# General purpose version range check |
68 |
+# Note that it matches up to but NOT including the second version |
69 |
+tc_version_is_between() { |
70 |
+ tc_version_is_at_least "${1}" && ! tc_version_is_at_least "${2}" |
71 |
+} |
72 |
+ |
73 |
GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}} |
74 |
GCC_PVR=${GCC_PV} |
75 |
[[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR} |
76 |
@@ -120,7 +125,7 @@ |
77 |
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp" |
78 |
tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc" |
79 |
tc_version_is_at_least 4.0 && IUSE+=" objc-gc" |
80 |
- tc_version_is_at_least 4.0 && ! tc_version_is_at_least 4.9 && IUSE+=" mudflap" |
81 |
+ tc_version_is_between 4.0 4.9 && IUSE+=" mudflap" |
82 |
tc_version_is_at_least 4.1 && IUSE+=" libssp objc++" |
83 |
tc_version_is_at_least 4.2 && IUSE+=" openmp" |
84 |
tc_version_is_at_least 4.3 && IUSE+=" fixed-point" |
85 |
@@ -472,7 +477,7 @@ |
86 |
|
87 |
# install the libstdc++ python into the right location |
88 |
# http://gcc.gnu.org/PR51368 |
89 |
- if tc_version_is_at_least 4.5 && ! tc_version_is_at_least 4.7 ; then |
90 |
+ if tc_version_is_between 4.5 4.7 ; then |
91 |
sed -i \ |
92 |
'/^pythondir =/s:=.*:= $(datadir)/python:' \ |
93 |
"${S}"/libstdc++-v3/python/Makefile.in || die |
94 |
@@ -527,12 +532,12 @@ |
95 |
|
96 |
# In gcc 3.3.x and 3.4.x, rename the java bins to gcc-specific names |
97 |
# in line with gcc-4. |
98 |
- if tc_version_is_at_least 3.3 && ! tc_version_is_at_least 4.0 ; then |
99 |
+ if tc_version_is_between 3.3 4.0 ; then |
100 |
do_gcc_rename_java_bins |
101 |
fi |
102 |
|
103 |
# Prevent libffi from being installed |
104 |
- if tc_version_is_at_least 3.0 && ! tc_version_is_at_least 4.8 ; then |
105 |
+ if tc_version_is_between 3.0 4.8 ; then |
106 |
sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die |
107 |
sed -i -e 's/\(install-data-am:\).*/\1/' "${S}"/libffi/include/Makefile.in || die |
108 |
fi |
109 |
@@ -875,7 +880,7 @@ |
110 |
|
111 |
# newer gcc versions like to bootstrap themselves with C++, |
112 |
# so we need to manually disable it ourselves |
113 |
- if tc_version_is_at_least 4.7 && ! is_cxx ; then |
114 |
+ if tc_version_is_between 4.7 4.8 && ! is_cxx ; then |
115 |
confgcc+=( --disable-build-with-cxx --disable-build-poststage1-with-cxx ) |
116 |
fi |
117 |
|
118 |
@@ -954,7 +959,7 @@ |
119 |
$(use_enable nptl tls) |
120 |
) |
121 |
[[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc+=( --enable-sjlj-exceptions ) |
122 |
- if tc_version_is_at_least 3.4 && ! tc_version_is_at_least 4.3 ; then |
123 |
+ if tc_version_is_between 3.4 4.3 ; then |
124 |
confgcc+=( --enable-clocale=uclibc ) |
125 |
fi |
126 |
;; |