oasis

commit: 073fc85a1964b3c4c3925647836aef7c91fbaade
parent 0c5dea9564e41d4266a203354af54548982483ea
Author: Michael Forney <mforney@mforney.org>
Date:   Sun,  3 Mar 2019 23:23:08 -0800

awk: Update to latest git

Diffstat:
M
pkg/awk/gen.lua
4
++--
M
pkg/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch
12
++++++------
M
pkg/awk/rev
2
+-

3 files changed, 9 insertions(+), 9 deletions(-)
diff --git 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
@@ -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
@@ -1 +1 @@
-3
+4