1 |
dirtyepic 13/12/28 03:48:25 |
2 |
|
3 |
Modified: ChangeLog toolchain.eclass |
4 |
Log: |
5 |
Reintroduce texinfo patch to unbreak older versions (bug #496224). |
6 |
|
7 |
Revision Changes Path |
8 |
1.1095 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1095&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1095&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1094&r2=1.1095 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1094 |
18 |
retrieving revision 1.1095 |
19 |
diff -u -r1.1094 -r1.1095 |
20 |
--- ChangeLog 28 Dec 2013 00:25:53 -0000 1.1094 |
21 |
+++ ChangeLog 28 Dec 2013 03:48:25 -0000 1.1095 |
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.1094 2013/12/28 00:25:53 robbat2 Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1095 2013/12/28 03:48:25 dirtyepic Exp $ |
27 |
+ |
28 |
+ 28 Dec 2013; Ryan Hill <dirtyepic@g.o> toolchain.eclass: |
29 |
+ Reintroduce texinfo patch to unbreak older versions (bug #496224). |
30 |
|
31 |
28 Dec 2013; Robin H. Johnson <robbat2@g.o> flag-o-matic.eclass: |
32 |
Spelling fixes. |
33 |
|
34 |
|
35 |
|
36 |
1.612 eclass/toolchain.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.612&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.612&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.611&r2=1.612 |
41 |
|
42 |
Index: toolchain.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
45 |
retrieving revision 1.611 |
46 |
retrieving revision 1.612 |
47 |
diff -u -r1.611 -r1.612 |
48 |
--- toolchain.eclass 27 Dec 2013 22:54:43 -0000 1.611 |
49 |
+++ toolchain.eclass 28 Dec 2013 03:48:25 -0000 1.612 |
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.611 2013/12/27 22:54:43 vapier Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.612 2013/12/28 03:48:25 dirtyepic Exp $ |
55 |
|
56 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
57 |
|
58 |
@@ -553,6 +553,9 @@ |
59 |
done |
60 |
sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828 |
61 |
|
62 |
+ # Prevent new texinfo from breaking old versions (see #198182, #464008) |
63 |
+ tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch |
64 |
+ |
65 |
if [[ -x contrib/gcc_update ]] ; then |
66 |
einfo "Touching generated files" |
67 |
./contrib/gcc_update --touch | \ |
68 |
@@ -1150,8 +1153,6 @@ |
69 |
# Disable gcc info regeneration -- it ships with generated info pages |
70 |
# already. Our custom version/urls/etc... trigger it. #464008 |
71 |
export gcc_cv_prog_makeinfo_modern=no |
72 |
- # Make sure we don't try to generate pages that don't even exist. #496224 |
73 |
- touch "${S}"/gcc/treelang/treelang.info 2>/dev/null |
74 |
|
75 |
# Do not let the X detection get in our way. We know things can be found |
76 |
# via system paths, so no need to hardcode things that'll break multilib. |