SHA256
3
0
forked from pool/bash

support also older bison versions

OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=376
This commit is contained in:
Dr. Werner Fink 2023-11-15 09:09:46 +00:00 committed by Git OBS Bridge
parent f4a5a50cce
commit b6fcb37fbd
3 changed files with 22 additions and 4 deletions

View File

@ -4,7 +4,7 @@
doc/Makefile.in | 2 +-
doc/bash.1 | 7 +++++--
general.h | 3 +++
parse.y | 2 +-
parse.y | 6 +++++-
shell.c | 6 +++++-
support/man2html.c | 1 +
support/rlvers.sh | 6 +++---
@ -12,7 +12,7 @@
tests/glob.tests | 4 ++--
tests/run-intl | 2 +-
tests/run-read | 2 +-
13 files changed, 37 insertions(+), 21 deletions(-)
13 files changed, 41 insertions(+), 21 deletions(-)
--- Makefile.in
+++ Makefile.in 2022-06-22 06:38:20.511747259 +0000
@ -129,6 +129,17 @@
# if defined (HAVE_SYS_TIME_H)
--- parse.y
+++ parse.y 2022-04-28 11:53:04.334380153 +0000
@@ -366,6 +366,10 @@ static FILE *yyerrstream;
/* Special; never created by yylex; only set by parse_comsub and xparse_dolparen */
%token DOLPAREN
+/* Declare token YYEOF as older bison version fails
+ with not defined as a token and has no rules */
+%token YYEOF
+
/* The types that the various syntactical units return. */
%type <command> inputunit command pipeline pipeline_command
@@ -1513,7 +1513,7 @@ input_file_descriptor ()
#if defined (READLINE)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 15 09:08:33 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Declare token YYEOF to be able to support older bison versions
as well
-------------------------------------------------------------------
Wed Nov 15 07:36:32 UTC 2023 - Dr. Werner Fink <werner@suse.de>

View File

@ -90,7 +90,7 @@ Patch49: bash-4.3-pathtemp.patch
Patch50: quotes-man2html.patch
BuildRequires: autoconf
# latest bash uses with patch 18 the tag YYEOF
BuildRequires: bison >= 3.8.1
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: glibc-locale
BuildRequires: glibc-locale-base
@ -281,7 +281,7 @@ set -x
%endif
%patch -P49 -b .pthtmp
%patch -P50 -b .qd
%patch -P0
%patch -P0 -b .p0
# This has to be always the same version as included in the bash its self
rl1=($(sed -rn '/RL_READLINE_VERSION/p' lib/readline/readline.h))
@ -506,6 +506,7 @@ echo exit 0 > tests/read7.sub
grep -F '$'\' doc/bash.html %{nil:test for boo#1203091}
%check
rm -vf tests/*.p0
%make_build -j1 check
%install