logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: e41789f435b31a4fd143f784b189317bfcb6bac4
parent 887f731a75aff6a8671d8215d133894893f1d150
Author: Michael Forney <mforney@mforney.org>
Date:   Mon,  4 Nov 2019 18:22:00 -0800

byacc: Update to 20191103

Diffstat:

Mpkg/byacc/.gitignore2+-
Mpkg/byacc/config.h4++++
Mpkg/byacc/gen.lua2+-
Apkg/byacc/patch/0001-Prevent-multiple-definitions-of-code_lines.patch25+++++++++++++++++++++++++
Mpkg/byacc/sha2562+-
Mpkg/byacc/url4++--
Mpkg/byacc/ver2+-
7 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/pkg/byacc/.gitignore b/pkg/byacc/.gitignore @@ -1,2 +1,2 @@ -/byacc-20190617.tgz +/byacc-20191103.tgz /src diff --git a/pkg/byacc/config.h b/pkg/byacc/config.h @@ -5,6 +5,9 @@ /* #undef GCC_SCANFLIKE */ /* #undef GCC_UNUSED */ #define HAVE_FCNTL_H 1 +#define HAVE_GETOPT 1 +#define HAVE_GETOPT_H 1 +#define HAVE_GETOPT_HEADER 1 #define HAVE_INTTYPES_H 1 /* #undef HAVE_LIBDBMALLOC */ /* #undef HAVE_LIBDMALLOC */ @@ -20,6 +23,7 @@ #define HAVE_VSNPRINTF 1 /* #undef MAXTABLE */ #define MIXEDCASE_FILENAMES 1 +/* #undef NEED_GETOPT_H */ /* #undef NO_LEAKS */ #define STDC_HEADERS 1 #define SYSTEM_NAME "linux-gnu" diff --git a/pkg/byacc/gen.lua b/pkg/byacc/gen.lua @@ -1,7 +1,7 @@ cflags{ '-Wall', '-pedantic', '-D HAVE_CONFIG_H', - '-D YYPATCH=20190617', + '-D YYPATCH=20191103', '-I $dir', } diff --git a/pkg/byacc/patch/0001-Prevent-multiple-definitions-of-code_lines.patch b/pkg/byacc/patch/0001-Prevent-multiple-definitions-of-code_lines.patch @@ -0,0 +1,25 @@ +From 71ddf61cc892a771d15d95937f1f13a9ce17e98b Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Mon, 4 Nov 2019 18:20:04 -0800 +Subject: [PATCH] Prevent multiple definitions of `code_lines` + +--- + defs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/defs.h b/defs.h +index 99d409c..2f3f923 100644 +--- a/defs.h ++++ b/defs.h +@@ -592,7 +592,7 @@ typedef enum + ,CODE_MAX /* this must be last */ + } + CODE_CASES; +-struct code_lines ++extern struct code_lines + { + char *lines; + size_t num; +-- +2.24.0 + diff --git a/pkg/byacc/sha256 b/pkg/byacc/sha256 @@ -1 +1 @@ -f87868167b920bf2cb30fc32b62f63ae15671181ef329226d1063100be02518d byacc-20190617.tgz +d291fb34816f45079067366b7f7300ffbf9f7e3f1aaf6d509b84442d065d11b9 byacc-20191103.tgz diff --git a/pkg/byacc/url b/pkg/byacc/url @@ -1 +1 @@ -url = "https://invisible-mirror.net/archives/byacc/byacc-20190617.tgz" -\ No newline at end of file +url = "https://invisible-mirror.net/archives/byacc/byacc-20191103.tgz" +\ No newline at end of file diff --git a/pkg/byacc/ver b/pkg/byacc/ver @@ -1 +1 @@ -20190617 r0 +20191103 r0