commit: 6567973a04a75b34104d143a4ac14c452f5fe6d5
parent 3970ee7d1ace219b7f0799686f2cec51d14b6d83
Author: Gábor Stefanik <netrolller.3d@gmail.com>
Date: Sun, 14 Apr 2024 20:59:57 +0200
Make byacc actually work when compiled against meslibc
This replaces the previous sed hackery with a proper patch, and removes
a few more libc functions that meslibc is missing.
The binary name is changed to "byacc" so it doesn't get overwritten by
heirloom yacc.
The bsearch() replacement code comes from an earlier version of byacc.
Diffstat:
3 files changed, 175 insertions(+), 11 deletions(-)
diff --git a/steps/byacc-20240109/byacc-20240109.checksums b/steps/byacc-20240109/byacc-20240109.checksums
@@ -1 +1 @@
-608651c4836eff7f164a0c6d238337a254fca964677bec76d87f85692ce71b59 /usr/bin/yacc
+79ff462e4247dc7316a163124b32c54e6c8cb6d2ff4dfb0c1818799efcc1d8a7 /usr/bin/byacc
diff --git a/steps/byacc-20240109/pass1.kaem b/steps/byacc-20240109/pass1.kaem
@@ -22,28 +22,22 @@ tar xf ../src/${pkg}.tar
rm -r ../src/
cd ${pkg}
-# Prepare
+# Prepare and patch
cp ../../files/Makefile .
-
-# meslibc has no fgetpos/fsetpos - emulate using fseek/ftell
-sed -i -e "s/fpos_t/long/" -e "s/fgetpos(f, &save_area.line_fpos) != 0/(save_area.line_fpos = ftell(f)) == -1/" \
- -e "s/fsetpos(input_file, &save_area.line_fpos)/fseek(input_file, save_area.line_fpos, SEEK_SET)/" reader.c
-
-# likewise, meslibc has no tmpfile()
-sed -i -e "s/tmpfile()/fopen(label, \"w+\")/" main.c
+patch -Np0 -i ../../patches/meslibc.patch
# Build yacc
make CC=tcc AR=tcc\ -ar CFLAGS=-DMAXPATHLEN=100\ -DEILSEQ=84\ -DMB_LEN_MAX=100 LDFLAGS=-lgetopt\ -static RANLIB=true
# Install yacc
-install yacc ${BINDIR}
+install yacc ${BINDIR}/byacc
cd ../..
# Checksums
if match x${UPDATE_CHECKSUMS} xTrue; then
sha256sum -o ${pkg}.checksums \
- /usr/bin/yacc
+ /usr/bin/byacc
install ${pkg}.checksums ${SRCDIR}
else
diff --git a/steps/byacc-20240109/patches/meslibc.patch b/steps/byacc-20240109/patches/meslibc.patch
@@ -0,0 +1,170 @@
+SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+
+Remove usages of tmpfile(), rewind(), fgetpos(), fsetpos() and bsearch(),
+which are unsupported by meslibc, and add missing declaration for strdup.
+
+License note: Berkeley Yacc is in the public domain, but it's linked with
+meslibc, which is GPL-3.0-or-later, so we apply that license here too.
+
+diff -ru ../byacc-20240109.bak/main.c ./main.c
+--- ../byacc-20240109.bak/main.c 2024-04-14 16:06:09.646465507 +0200
++++ ./main.c 2024-04-14 20:41:56.227083399 +0200
+@@ -788,7 +788,7 @@
+ (void)umask(save_umask);
+ }
+ #else
+- result = tmpfile();
++ result = fopen(label, "w+");
+ #endif
+
+ if (result == 0)
+diff -ru ../byacc-20240109.bak/output.c ./output.c
+--- ../byacc-20240109.bak/output.c 2024-04-14 16:06:09.646465507 +0200
++++ ./output.c 2024-04-14 16:06:24.636465897 +0200
+@@ -1289,7 +1289,7 @@
+ {
+ if (union_file != 0)
+ {
+- rewind(union_file);
++ fseek(union_file, 0, SEEK_SET);
+ while ((c = getc(union_file)) != EOF)
+ putc_code(fp, c);
+ }
+@@ -1314,7 +1314,7 @@
+
+ if (text_file == NULL)
+ open_error("text_file");
+- rewind(text_file);
++ fseek(text_file, 0, SEEK_SET);
+ in = text_file;
+ if ((c = getc(in)) == EOF)
+ return;
+@@ -1684,7 +1684,7 @@
+ int state;
+ char line_state[20];
+
+- rewind(action_file);
++ fseek(action_file, 0, SEEK_SET);
+ if ((c = getc(action_file)) == EOF)
+ return;
+
+diff -ru ../byacc-20240109.bak/reader.c ./reader.c
+--- ../byacc-20240109.bak/reader.c 2024-04-14 16:06:09.646465507 +0200
++++ ./reader.c 2024-04-14 20:40:58.387082748 +0200
+@@ -70,7 +70,7 @@
+ char *line_data; /* saved input-line */
+ size_t line_used; /* position within saved input-line */
+ size_t line_size; /* length of saved input-line */
+- fpos_t line_fpos; /* pointer before reading past saved input-line */
++ long line_fpos; /* pointer before reading past saved input-line */
+ }
+ SAVE_LINE;
+
+@@ -315,7 +315,7 @@
+ line = save_area.line_data;
+ cptr = save_area.line_used + line;
+ linesize = save_area.line_size;
+- if (fsetpos(input_file, &save_area.line_fpos) != 0)
++ if (fseek(input_file, save_area.line_fpos, SEEK_SET) != 0)
+ on_error();
+ memset(&save_area, 0, sizeof(save_area));
+ }
+@@ -338,7 +338,7 @@
+ save_area.line_size = linesize;
+ NO_SPACE(save_area.line_data);
+ memcpy(save_area.line_data, line, linesize);
+- if (fgetpos(f, &save_area.line_fpos) != 0)
++ if ((save_area.line_fpos = ftell(f)) == -1)
+ on_error();
+ must_save = -must_save;
+ }
+@@ -572,6 +572,36 @@
+ return strcmp(p->name, q->name);
+ }
+
++/*
++ * Compare keyword to cached token, treating '_' and '-' the same. Some
++ * grammars rely upon this misfeature.
++ */
++static int
++matchec(const char *name)
++{
++ const char *p = cache;
++ const char *q = name;
++ int code = 0; /* assume mismatch */
++
++ while (*p != '\0' && *q != '\0')
++ {
++ char a = *p++;
++ char b = *q++;
++ if (a == '_')
++ a = '-';
++ if (b == '_')
++ b = '-';
++ if (a != b)
++ break;
++ if (*p == '\0' && *q == '\0')
++ {
++ code = 1;
++ break;
++ }
++ }
++ return code;
++}
++
+ static int
+ keyword(void)
+ {
+@@ -612,10 +642,36 @@
+ }
+ cachec(NUL);
+
+- if ((key = bsearch(cache, keywords,
+- sizeof(keywords) / sizeof(*key),
+- sizeof(*key), compare_keys)))
+- return key->token;
++ if (matchec("token") || matchec("term"))
++ return (TOKEN);
++ if (matchec("type"))
++ return (TYPE);
++ if (matchec("left"))
++ return (LEFT);
++ if (matchec("right"))
++ return (RIGHT);
++ if (matchec("nonassoc") || matchec("binary"))
++ return (NONASSOC);
++ if (matchec("start"))
++ return (START);
++ if (matchec("union"))
++ return (UNION);
++ if (matchec("ident"))
++ return (IDENT);
++ if (matchec("expect"))
++ return (EXPECT);
++ if (matchec("expect-rr"))
++ return (EXPECT_RR);
++ if (matchec("pure-parser"))
++ return (PURE_PARSER);
++ if (matchec("parse-param"))
++ return (PARSE_PARAM);
++ if (matchec("lex-param"))
++ return (LEX_PARAM);
++ if (matchec("token-table"))
++ return (TOKEN_TABLE);
++ if (matchec("yacc"))
++ return (POSIX_YACC);
+ }
+ else
+ {
+@@ -1178,6 +1234,9 @@
+ return result;
+ }
+
++char *
++strdup (char const *s);
++
+ static void
+ save_param(int k, char *buffer, int name, int type2)
+ {
