rpms/compat-gcc-34/devel gcc34-makeinfo.patch, NONE, 1.1 compat-gcc-34.spec, 1.7, 1.8

[Jakub Jelinek (jakub)]

Author: jakub

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

Modified Files:
	compat-gcc-34.spec 
Added Files:
	gcc34-makeinfo.patch 
Log Message:
3.4.6-8

gcc34-makeinfo.patch:

--- NEW FILE gcc34-makeinfo.patch ---
2007-09-23  Jakub Jelinek  <jakub at redhat.com>

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

--- gcc/configure.ac.jj	2007-10-16 21:18:08.000000000 +0200
+++ gcc/configure.ac	2007-10-16 21:18:08.000000000 +0200
@@ -648,7 +648,7 @@ else
   # 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]*|[5-9]*|[1-9][0-9]*])
 fi
 
 if test $gcc_cv_prog_makeinfo_modern = no; then
--- gcc/configure.jj	2005-11-21 14:43:20.000000000 +0100
+++ gcc/configure	2007-10-16 21:19:11.000000000 +0200
@@ -5232,7 +5232,7 @@ else
   echo "configure:5232: 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]*|[5-9]*|[1-9][0-9]*)
             gcc_cv_prog_makeinfo_modern=yes;;
     *)      gcc_cv_prog_makeinfo_modern=no;;
   esac


Index: compat-gcc-34.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-gcc-34/devel/compat-gcc-34.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- compat-gcc-34.spec	16 Oct 2007 16:17:20 -0000	1.7
+++ compat-gcc-34.spec	16 Oct 2007 19:23:04 -0000	1.8
@@ -114,6 +114,7 @@
 Patch53: gcc34-rh242685.patch
 
 Patch100: gcc34-ldbl-hack.patch
+Patch101: gcc34-makeinfo.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -231,6 +232,7 @@
 %patch53 -p0 -b .rh242685~
 
 %patch100 -p0 -b .ldbl-hack~
+%patch101 -p0 -b .makeinfo~
 
 perl -pi -e 's/3\.4\.7/3.4.6/' gcc/version.c
 perl -pi -e 's/"%{version}"/"%{version} \(release\)"/' gcc/version.c
@@ -667,6 +669,7 @@
 * Tue Oct 16 2007 Jakub Jelinek  <jakub at redhat.com> 3.4.6-8
 - update License tag
 - build with ld --build-id
+- grok makeinfo >= 4.10 during configury
 - avoid aliasing warnings in libstdc++-v3 headers when compiled
   with g++ 4.x (Paolo Carlini, PR libstdc++/24975, #240020)
 - fix RTL expansion of COMPLEX_EXPR (#233941)