rpms/gcc/devel gcc41-makeinfo-ver.patch, NONE, 1.1 gcc41.spec, 1.175, 1.176

[Jakub Jelinek (jakub)]

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8728

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

--- NEW FILE gcc41-makeinfo-ver.patch ---
2007-09-22  Jakub Jelinek  <jakub at redhat.com>

	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
	* configure: Regenerated.

--- gcc/configure.ac.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure.ac	2007-09-22 08:38:07.000000000 -0400
@@ -833,7 +833,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir
 # that we can use it.
 gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
-  [4.[2-9]*])
+  [4.[2-9]*|4.[1-9][0-9]*])
 if test $gcc_cv_prog_makeinfo_modern = no; then
   MAKEINFO="$MISSING makeinfo"
   AC_MSG_WARN([
--- gcc/configure.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure	2007-09-22 08:38:30.000000000 -0400
@@ -7496,7 +7496,7 @@ else
   echo "configure:7496: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
-    4.[2-9]*)
+    4.[2-9]*|4.[1-9][0-9]*)
             gcc_cv_prog_makeinfo_modern=yes;;
     *)      gcc_cv_prog_makeinfo_modern=no;;
   esac


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- gcc41.spec	22 Sep 2007 08:13:13 -0000	1.175
+++ gcc41.spec	22 Sep 2007 12:45:46 -0000	1.176
@@ -155,6 +155,7 @@
 Patch39: gcc41-pr33423.patch
 Patch40: gcc41-scanf-fmt-check.patch
 Patch41: gcc41-pr33506.patch
+Patch42: gcc41-makeinfo-ver.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -479,6 +480,7 @@
 %patch39 -p0 -b .pr33423~
 %patch40 -p0 -b .scanf-fmt-check~
 %patch41 -p0 -b .pr33506~
+%patch42 -p0 -b .makeinfo-ver~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1636,6 +1638,7 @@
 * Sat Sep 22 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-26
 - don't ignore throw specification of function types in type hashing
   (PR c++/33506)
+- handle makeinfo version >= 4.10 in gcc configury
 
 * Mon Sep 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-25
 - fix ICE on __builtin_mem*_chk if it couldn't be folded until