fix build with bison >= 3.59

diff --git a/bison3.59.patch b/bison3.59.patch
new file mode 100644 (file)
index 0000000..d434eb2
--- /dev/null
+++ b/bison3.59.patch
@@ -0,0 +1,21 @@
+From 47720e2255f34ecad49763c66a7ea02a55a3f60a Mon Sep 17 00:00:00 2001
+From: Nobuyoshi Nakada <nobu@ruby-lang.org>
+Date: Mon, 4 May 2020 13:35:38 +0900
+Subject: [PATCH] Bison 3.59.1 folds yydestruct function header
+
+---
+ tool/ytab.sed | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tool/ytab.sed b/tool/ytab.sed
+index ba7566ac7fab..95a9b3e1eb33 100755
+--- a/tool/ytab.sed
++++ b/tool/ytab.sed
+@@ -14,6 +14,7 @@ a\
+ }
+ /^yydestruct.*yymsg/,/{/{
+   /^yydestruct/{
++    /,$/N
+     /[, *]p)/!{
+       H
+       s/^/ruby_parser_&/

diff --git a/ruby.spec b/ruby.spec
index aba71b6a1035ec1fb4e61b123de411019e40e2fd..863cd02bb1664d7e2f443b3e257287ac377d05c6 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -55,6 +55,7 @@ Source4:      rdoc.1
 Source5:       testrb.1
 Source6:       operating_system.rb
 Patch0:                autoconf2.70.patch
+Patch1:                bison3.59.patch
 Patch2:                fix-bison-invocation.patch
 Patch3:                mkmf-verbose.patch
 Patch4:                strip-ccache.patch
@@ -680,6 +681,7 @@ wywołującego je. Aby to osiągnąć wystarczy bardzo mało kodu.
 %prep
 %setup -q -n %{oname}-%{pkg_version} -a2 -a3
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1