| 1 |
nerdboy 13/11/25 03:09:48 |
| 2 |
|
| 3 |
Added: gnat-gcc-4.5.4-tex-version-workaround.patch |
| 4 |
Log: |
| 5 |
Updates (and a patch) for texinfo borkage. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key ) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-lang/gnat-gcc/files/gnat-gcc-4.5.4-tex-version-workaround.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/files/gnat-gcc-4.5.4-tex-version-workaround.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/files/gnat-gcc-4.5.4-tex-version-workaround.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gnat-gcc-4.5.4-tex-version-workaround.patch |
| 16 |
=================================================================== |
| 17 |
Index: gcc-4.5.4/configure |
| 18 |
=================================================================== |
| 19 |
--- gcc-4.5.4.orig/configure |
| 20 |
+++ gcc-4.5.4/configure |
| 21 |
@@ -8384,9 +8384,9 @@ case " $build_configdirs " in |
| 22 |
*) |
| 23 |
|
| 24 |
# For an installed makeinfo, we require it to be from texinfo 4.7 or |
| 25 |
- # higher, else we use the "missing" dummy. |
| 26 |
+ # some higher 4.x, else we use the "missing" dummy. |
| 27 |
if ${MAKEINFO} --version \ |
| 28 |
- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then |
| 29 |
+ | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9]))' >/dev/null 2>&1; then |
| 30 |
: |
| 31 |
else |
| 32 |
MAKEINFO="$MISSING makeinfo" |
| 33 |
Index: gcc-4.5.4/gcc/configure |
| 34 |
=================================================================== |
| 35 |
--- gcc-4.5.4.orig/gcc/configure |
| 36 |
+++ gcc-4.5.4/gcc/configure |
| 37 |
@@ -7401,8 +7401,8 @@ fi |
| 38 |
|
| 39 |
if test -n "$MAKEINFO"; then |
| 40 |
# Found it, now check the version. |
| 41 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for modern makeinfo" >&5 |
| 42 |
-$as_echo_n "checking for modern makeinfo... " >&6; } |
| 43 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 4.7+ makeinfo" >&5 |
| 44 |
+$as_echo_n "checking for 4.7+ makeinfo... " >&6; } |
| 45 |
if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then : |
| 46 |
$as_echo_n "(cached) " >&6 |
| 47 |
else |
| 48 |
@@ -7411,7 +7411,7 @@ else |
| 49 |
|
| 50 |
case $ac_prog_version in |
| 51 |
'') gcc_cv_prog_makeinfo_modern=no;; |
| 52 |
- 4.[7-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*) gcc_cv_prog_makeinfo_modern=yes;; |
| 53 |
+ 4.[7-9]*|4.[1-9][0-9]*) gcc_cv_prog_makeinfo_modern=yes;; |
| 54 |
*) gcc_cv_prog_makeinfo_modern=no;; |
| 55 |
esac |
| 56 |
|
| 57 |
@@ -7427,10 +7427,10 @@ $as_echo "$gcc_cv_prog_makeinfo_modern" |
| 58 |
|
| 59 |
if test $gcc_cv_prog_makeinfo_modern = no; then |
| 60 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: |
| 61 |
-*** Makeinfo is missing or too old. |
| 62 |
+*** Makeinfo is missing, too old or too new. |
| 63 |
*** Info documentation will not be built." >&5 |
| 64 |
$as_echo "$as_me: WARNING: |
| 65 |
-*** Makeinfo is missing or too old. |
| 66 |
+*** Makeinfo is missing, too old or too new. |
| 67 |
*** Info documentation will not be built." >&2;} |
| 68 |
BUILD_INFO= |
| 69 |
else |
| 70 |
Index: gcc-4.5.4/libiberty/configure |
| 71 |
=================================================================== |
| 72 |
--- gcc-4.5.4.orig/libiberty/configure |
| 73 |
+++ gcc-4.5.4/libiberty/configure |
| 74 |
@@ -2440,13 +2440,13 @@ $as_echo "$as_me: WARNING: |
| 75 |
;; |
| 76 |
*) |
| 77 |
case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in |
| 78 |
- x*\ [1-3].* ) |
| 79 |
- MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true" |
| 80 |
+ x*\ [1-35-9].* ) |
| 81 |
+ MAKEINFO="@echo $MAKEINFO is not 4.x; true" |
| 82 |
BUILD_INFO= |
| 83 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: |
| 84 |
-*** Makeinfo is too old. Info documentation will not be built." >&5 |
| 85 |
+*** Makeinfo is not 4.x. Info documentation will not be built." >&5 |
| 86 |
$as_echo "$as_me: WARNING: |
| 87 |
-*** Makeinfo is too old. Info documentation will not be built." >&2;} |
| 88 |
+*** Makeinfo is not 4.x. Info documentation will not be built." >&2;} |
| 89 |
;; |
| 90 |
esac |
| 91 |
;; |
Archives