From e91ac346daa56f606e34da5a7a153bb55263f7dd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 11 Oct 2021 11:40:47 +0200 Subject: bison: update 3.7.6 -> 3.8.1 Drop patch merged upstream. (From OE-Core rev: 0f07360ebcab7e337c1cb9b9a7a844b102bd5e15) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../0001-Use-mapped-file-name-for-symbols.patch | 62 ---------------------- meta/recipes-devtools/bison/bison_3.7.6.bb | 53 ------------------ meta/recipes-devtools/bison/bison_3.8.1.bb | 52 ++++++++++++++++++ 3 files changed, 52 insertions(+), 115 deletions(-) delete mode 100644 meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch delete mode 100644 meta/recipes-devtools/bison/bison_3.7.6.bb create mode 100644 meta/recipes-devtools/bison/bison_3.8.1.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch b/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch deleted file mode 100644 index 568ee4df19..0000000000 --- a/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 2a3db4e3b8d33bad5577c2fcfe124ee7a202ef4f Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Mon, 15 Feb 2021 20:39:57 -0600 -Subject: [PATCH] Use mapped file name for symbols - -Applies the file name mapping before exporting it as a symbol. This -allows the symbols to correctly respect the --file-prefix-map command -line option. - -Signed-off-by: Joshua Watt -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bison-patches/2021-02/msg00014.html] ---- - src/muscle-tab.c | 4 +++- - src/output.c | 8 ++++++-- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/muscle-tab.c b/src/muscle-tab.c -index b610d0b8..3e7657ca 100644 ---- a/src/muscle-tab.c -+++ b/src/muscle-tab.c -@@ -204,8 +204,10 @@ static void - muscle_syncline_grow (char const *key, location loc) - { - obstack_printf (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line); -+ char *f = map_file_name (loc.start.file); - obstack_quote (&muscle_obstack, -- quotearg_style (c_quoting_style, loc.start.file)); -+ quotearg_style (c_quoting_style, f)); -+ free (f); - obstack_sgrow (&muscle_obstack, ")dnl\n["); - char const *extension = obstack_finish0 (&muscle_obstack); - muscle_grow (key, extension, "", ""); -diff --git a/src/output.c b/src/output.c -index 391d8e65..34dbc671 100644 ---- a/src/output.c -+++ b/src/output.c -@@ -531,7 +531,9 @@ user_actions_output (FILE *out) - { - fprintf (out, "b4_syncline(%d, ", - rules[r].action_loc.start.line); -- string_output (out, rules[r].action_loc.start.file); -+ char *f = map_file_name (rules[r].action_loc.start.file); -+ string_output (out, f); -+ free(f); - fprintf (out, ")dnl\n"); - } - fprintf (out, "[%*s%s]],\n[[", -@@ -629,8 +631,10 @@ prepare_symbol_definitions (void) - - if (p->code) - { -+ char *f = map_file_name (p->location.start.file); - SET_KEY2 (pname, "file"); -- MUSCLE_INSERT_C_STRING (key, p->location.start.file); -+ MUSCLE_INSERT_C_STRING (key, f); -+ free (f); - - SET_KEY2 (pname, "line"); - MUSCLE_INSERT_INT (key, p->location.start.line); --- -2.30.0 - diff --git a/meta/recipes-devtools/bison/bison_3.7.6.bb b/meta/recipes-devtools/bison/bison_3.7.6.bb deleted file mode 100644 index c85ae04976..0000000000 --- a/meta/recipes-devtools/bison/bison_3.7.6.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "GNU Project parser generator (yacc replacement)" -DESCRIPTION = "Bison is a general-purpose parser generator that converts an annotated context-free grammar into \ -an LALR(1) or GLR parser for that grammar. Bison is upward compatible with Yacc: all properly-written Yacc \ -grammars ought to work with Bison with no change. Anyone familiar with Yacc should be able to use Bison with \ -little trouble." -HOMEPAGE = "http://www.gnu.org/software/bison/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SECTION = "devel" -DEPENDS = "bison-native flex-native" - -SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ - file://add-with-bisonlocaledir.patch \ - file://0001-Use-mapped-file-name-for-symbols.patch \ - " -SRC_URI[sha256sum] = "67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf" - -inherit autotools gettext texinfo - -# No point in hardcoding path to m4, just use PATH -CACHED_CONFIGUREVARS = "ac_cv_path_M4=m4" - -PACKAGECONFIG ??= "readline ${@ 'textstyle' if d.getVar('USE_NLS') == 'yes' else ''}" -PACKAGECONFIG:class-native ??= "" - -# Make readline and textstyle optional. There are recipie for these, but leave them -# disabled for the native recipe. This prevents host contamination of the native tool. -PACKAGECONFIG[readline] = "--with-libreadline-prefix,--without-libreadline-prefix,readline" -PACKAGECONFIG[textstyle] = "--with-libtextstyle-prefix,--without-libtextstyle-prefix,gettext" - -# Include the cached configure variables, configure is really good at finding -# libreadline, even if we don't want it. -CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'readline', '', ' \ - ac_cv_header_readline_history_h=no \ - ac_cv_header_readline_readline_h=no \ - gl_cv_lib_readline=no', d)}" - -# The automatic m4 path detection gets confused, so force the right value -acpaths = "-I ./m4" - -do_compile:prepend() { - for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done -} - -do_install:append:class-native() { - create_wrapper ${D}/${bindir}/bison \ - BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison -} -do_install:append:class-nativesdk() { - create_wrapper ${D}/${bindir}/bison \ - BISON_PKGDATADIR=${datadir}/bison -} -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/bison/bison_3.8.1.bb b/meta/recipes-devtools/bison/bison_3.8.1.bb new file mode 100644 index 0000000000..a6159b007a --- /dev/null +++ b/meta/recipes-devtools/bison/bison_3.8.1.bb @@ -0,0 +1,52 @@ +SUMMARY = "GNU Project parser generator (yacc replacement)" +DESCRIPTION = "Bison is a general-purpose parser generator that converts an annotated context-free grammar into \ +an LALR(1) or GLR parser for that grammar. Bison is upward compatible with Yacc: all properly-written Yacc \ +grammars ought to work with Bison with no change. Anyone familiar with Yacc should be able to use Bison with \ +little trouble." +HOMEPAGE = "http://www.gnu.org/software/bison/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" +SECTION = "devel" +DEPENDS = "bison-native flex-native" + +SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ + file://add-with-bisonlocaledir.patch \ + " +SRC_URI[sha256sum] = "31fc602488aad6bdecf0ccc556e0fc72fc57cdc595cf92398f020e0cf4980f15" + +inherit autotools gettext texinfo + +# No point in hardcoding path to m4, just use PATH +CACHED_CONFIGUREVARS = "ac_cv_path_M4=m4" + +PACKAGECONFIG ??= "readline ${@ 'textstyle' if d.getVar('USE_NLS') == 'yes' else ''}" +PACKAGECONFIG:class-native ??= "" + +# Make readline and textstyle optional. There are recipie for these, but leave them +# disabled for the native recipe. This prevents host contamination of the native tool. +PACKAGECONFIG[readline] = "--with-libreadline-prefix,--without-libreadline-prefix,readline" +PACKAGECONFIG[textstyle] = "--with-libtextstyle-prefix,--without-libtextstyle-prefix,gettext" + +# Include the cached configure variables, configure is really good at finding +# libreadline, even if we don't want it. +CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'readline', '', ' \ + ac_cv_header_readline_history_h=no \ + ac_cv_header_readline_readline_h=no \ + gl_cv_lib_readline=no', d)}" + +# The automatic m4 path detection gets confused, so force the right value +acpaths = "-I ./m4" + +do_compile:prepend() { + for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done +} + +do_install:append:class-native() { + create_wrapper ${D}/${bindir}/bison \ + BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison +} +do_install:append:class-nativesdk() { + create_wrapper ${D}/${bindir}/bison \ + BISON_PKGDATADIR=${datadir}/bison +} +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf