diff options
| author | Michael Forney <mforney@mforney.org> | 2019-03-03 23:23:08 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-03-03 23:23:08 -0800 |
| commit | 073fc85a1964b3c4c3925647836aef7c91fbaade (patch) | |
| tree | a8a151c674e506edecabf4357da529ea5c71e3d9 /pkg | |
| parent | 0c5dea9564e41d4266a203354af54548982483ea (diff) | |
awk: Update to latest git
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/awk/gen.lua | 4 | ||||
| -rw-r--r-- | pkg/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch | 12 | ||||
| -rw-r--r-- | pkg/awk/rev | 2 | ||||
| m--------- | pkg/awk/src | 0 |
4 files changed, 9 insertions, 9 deletions
diff --git a/pkg/awk/gen.lua b/pkg/awk/gen.lua index cbb7e9e7..c70bea8a 100644 --- a/pkg/awk/gen.lua +++ b/pkg/awk/gen.lua @@ -16,8 +16,8 @@ sub('tools.ninja', function() exe('maketab', {'maketab.c'}) end) -rule('maketab', '(cd $outdir && ./maketab) >$out.tmp && mv $out.tmp $out') -build('maketab', '$outdir/proctab.c', {'|', '$outdir/maketab', '$outdir/ytab.h'}) +rule('maketab', '$outdir/maketab $in >$out.tmp && mv $out.tmp $out') +build('maketab', '$outdir/proctab.c', {'$outdir/ytab.h', '|', '$outdir/maketab'}) exe('awk', [[ b.c main.c parse.c tran.c lib.c run.c lex.c diff --git a/pkg/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch b/pkg/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch index 5051b526..1d8044f4 100644 --- a/pkg/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch +++ b/pkg/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch @@ -1,4 +1,4 @@ -From cf2f53aa6a7662096985efbc814651b129399cd8 Mon Sep 17 00:00:00 2001 +From 0833af4476b889fa0696ddfddfc79d7de0b8d3ee Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 10 Dec 2016 19:57:39 -0800 Subject: [PATCH] maketab: Only consider #define lines that match the expected @@ -9,18 +9,18 @@ Subject: [PATCH] maketab: Only consider #define lines that match the expected 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maketab.c b/maketab.c -index e23974c..809c1de 100644 +index dbe3d24..0076daf 100644 --- a/maketab.c +++ b/maketab.c -@@ -133,7 +133,7 @@ int main(int argc, char *argv[]) +@@ -137,7 +137,7 @@ int main(int argc, char *argv[]) i = 0; while (fgets(buf, sizeof buf, fp) != NULL) { n = sscanf(buf, "%1c %s %s %d", &c, def, name, &tok); - if (c != '#' || (n != 4 && strcmp(def,"define") != 0)) /* not a valid #define */ + if (c != '#' || n != 4 || strcmp(def,"define") != 0) /* not a valid #define */ continue; - if (tok < FIRSTTOKEN || tok > LASTTOKEN) { - /* fprintf(stderr, "maketab funny token %d %s ignored\n", tok, buf); */ + if (strcmp(name, "YYSTYPE_IS_DECLARED") == 0) + continue; -- -2.18.0 +2.20.1 diff --git a/pkg/awk/rev b/pkg/awk/rev index 00750edc..b8626c4c 100644 --- a/pkg/awk/rev +++ b/pkg/awk/rev @@ -1 +1 @@ -3 +4 diff --git a/pkg/awk/src b/pkg/awk/src -Subproject 1d9d86418a8e77a0270b5cff4ba97c9c4106b75 +Subproject 2d9034a01a91359c5e47fd4275a00debaaab56c |