- Include cstdio in CharScanner.hpp (needed to build with GCC 4.4)

- Merge changes from includestrings patch into the above one
This commit is contained in:
Deepak Bhole 2009-03-20 18:47:39 +00:00
parent aca6077c84
commit cb8851ea5c
3 changed files with 18 additions and 13 deletions

12
antlr-2.7.7-newgcc.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up ./lib/cpp/antlr/CharScanner.hpp.sav ./lib/cpp/antlr/CharScanner.hpp
--- ./lib/cpp/antlr/CharScanner.hpp.sav 2009-03-20 14:42:43.000000000 -0400
+++ ./lib/cpp/antlr/CharScanner.hpp 2009-03-20 14:43:29.000000000 -0400
@@ -11,6 +11,8 @@
#include <antlr/config.hpp>
#include <map>
+#include <strings.h>
+#include <cstdio>
#ifdef HAS_NOT_CCTYPE_H
#include <ctype.h>

View File

@ -1,11 +0,0 @@
diff -up ./lib/cpp/antlr/CharScanner.hpp.sav ./lib/cpp/antlr/CharScanner.hpp
--- ./lib/cpp/antlr/CharScanner.hpp.sav 2008-02-27 19:04:33.000000000 -0500
+++ ./lib/cpp/antlr/CharScanner.hpp 2008-02-27 19:04:54.000000000 -0500
@@ -9,6 +9,7 @@
*/
#include <antlr/config.hpp>
+#include <strings.h>
#include <map>

View File

@ -39,7 +39,7 @@
Summary: ANother Tool for Language Recognition Summary: ANother Tool for Language Recognition
Name: antlr Name: antlr
Version: 2.7.7 Version: 2.7.7
Release: 4%{?dist} Release: 5%{?dist}
Epoch: 0 Epoch: 0
License: Public Domain License: Public Domain
URL: http://www.antlr.org/ URL: http://www.antlr.org/
@ -51,7 +51,7 @@ Source2: %{name}-script
#http://www.antlr.org/share/1069557132934/makefile.gcj #http://www.antlr.org/share/1069557132934/makefile.gcj
Source3: makefile.gcj Source3: makefile.gcj
Patch0: %{name}-jedit.patch Patch0: %{name}-jedit.patch
Patch1: %{name}-includestrings.patch Patch1: %{name}-%{version}-newgcc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%if %{native} %if %{native}
@ -311,6 +311,10 @@ fi
%changelog %changelog
* Fri Mar 20 2009 Deepak Bhole <dbhole@redhat.com> - 0:2.7.7-5
- Include cstdio in CharScanner.hpp (needed to build with GCC 4.4)
- Merge changes from includestrings patch into the above one
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.7.7-4 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.7.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild