rpms/bison/devel bison-2.1-m4_map.patch, NONE, 1.1 bison.spec, 1.23, 1.24 bison-2.0.tar.gz.sig, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 2 03:29:07 UTC 2006
Author: roland
Update of /cvs/dist/rpms/bison/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10247
Modified Files:
bison.spec
Added Files:
bison-2.1-m4_map.patch
Removed Files:
bison-2.0.tar.gz.sig
Log Message:
Fix K&R parser definition when it has no arguments (#190376).
bison-2.1-m4_map.patch:
m4sugar.m4 | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
--- NEW FILE bison-2.1-m4_map.patch ---
2005-10-05 Paul Eggert <eggert at cs.ucla.edu>
* data/m4sugar/m4sugar.m4 (_m4_map): New macro.
(m4_map, m4_map_sep): Use it. Handle the empty list correctly.
--- bison-2.1/data/m4sugar/m4sugar.m4
+++ bison-2.1/data/m4sugar/m4sugar.m4
@@ -398,8 +398,11 @@ m4_define([m4_cdr],
# of LIST (which can be lists themselves, for multiple arguments MACROs).
m4_define([m4_fst], [$1])
m4_define([m4_map],
+[m4_if([$2], [[]], [],
+ [_m4_map([$1], [$2])])])
+m4_define([_m4_map],
[m4_ifval([$2],
- [$1(m4_fst($2))[]m4_map([$1], m4_cdr($2))])])
+ [$1(m4_fst($2))[]_m4_map([$1], m4_cdr($2))])])
# m4_map_sep(MACRO, SEPARATOR, LIST)
@@ -408,8 +411,8 @@ m4_define([m4_map],
# are the elements of LIST (which can be lists themselves, for multiple
# arguments MACROs).
m4_define([m4_map_sep],
-[m4_ifval([$3],
- [$1(m4_fst($3))[]m4_map([$2[]$1], m4_cdr($3))])])
+[m4_if([$3], [[]], [],
+ [$1(m4_fst($3))[]_m4_map([$2[]$1], m4_cdr($3))])])
## ---------------------------------------- ##
Index: bison.spec
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/bison.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bison.spec 11 Feb 2006 02:08:38 -0000 1.23
+++ bison.spec 2 May 2006 03:29:05 -0000 1.24
@@ -1,15 +1,17 @@
Summary: A GNU general-purpose parser generator.
Name: bison
Version: 2.1
-Release: 1.2.1
+Release: 2
License: GPL
Group: Development/Tools
Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
-Url: http://www.gnu.org/software/bison/
+URL: http://www.gnu.org/software/bison/
Prereq: /sbin/install-info
BuildRoot: %{_tmppath}/%{name}-root
Requires: m4 >= 1.4
+Patch1: bison-2.1-m4_map.patch
+
%description
Bison is a general purpose parser generator that converts a grammar
description for an LALR(1) context-free grammar into a C program to
@@ -50,6 +52,8 @@
%prep
%setup -q
+%patch1 -p1
+
%build
%configure
make
@@ -98,6 +102,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 1 2006 Roland McGrath <roland at redhat.com> - 2.1-3
+- Fix K&R parser definition when it has no arguments (#190376).
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2.1
- bump again for double-long bug on ppc(64)
--- bison-2.0.tar.gz.sig DELETED ---
More information about the fedora-cvs-commits
mailing list