Skip to content

Commit c00fa39

Browse files
authored
Merge pull request #498 from fosslinux/byacc2oyacc
Replace byacc with oyacc
2 parents 0373292 + 7048b4a commit c00fa39

File tree

15 files changed

+197
-329
lines changed

15 files changed

+197
-329
lines changed

parts.rst

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,23 @@ we skip them.
322322

323323
The ``cp`` in this stage replaces the ``mescc-tools-extra`` ``cp``.
324324

325-
byacc 20240109
326-
==============
325+
oyacc 6.6
326+
=========
327+
328+
``oyacc`` is a portable derivative of OpenBSD's Yacc parser generator. Unlike
329+
``bison``, it can be compiled with a simple ``Makefile``. Some simple patches
330+
are required for mes libc.
331+
332+
We need a Yacc implementation for bash.
327333

328-
The Berkeley Yacc parser generator, a public-domain implementation of the
329-
``yacc`` utility. Differently from the analogous ``bison`` utility from the
330-
GNU project, it can be compiled with a simple ``Makefile``.
334+
Side note; the following other implementations have been tested and not adopted:
331335

332-
Some code is backported from an earlier version of byacc, 20140101, because
333-
of an incompatibility of newer versions with meslibc.
336+
- GNU Bison: requires a more complicated build we cannot yet support without
337+
lots of work
338+
- Heirloom Devtools: licensed under a GPL-incompatible license, which makes the
339+
resultant binary with mes libc (GPL licensed) non-distributable
340+
- Berkeley Yacc: has a few C files generated using an Awk script; Awk is not yet
341+
available to us
334342

335343
bash 2.05b
336344
==========
@@ -341,7 +349,7 @@ kaem, including proper POSIX sh support, globbing, etc.
341349

342350
Bash ships with a bison pre-generated file here which we delete.
343351
Unfortunately, we have not bootstrapped bison but fortunately for us,
344-
Berkeley Yacc is able to cope here.
352+
OpenBSD's Yacc is able to cope here.
345353

346354
setup_repo
347355
==========
@@ -465,7 +473,7 @@ Differently from the analogous utilities from the GNU project, they can
465473
be compiled with a simple ``Makefile``.
466474

467475
Because issues with the Heirloom version of ``yacc`` compiled against musl,
468-
we continue using Berkeley Yacc together with Heirloom ``lex`` for the next
476+
we continue using OpenBSD's ``yacc`` together with Heirloom ``lex`` for the next
469477
few steps.
470478

471479
flex 2.5.11

steps/SHA256SUMS.pkgs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ c30d11b798f3a6198f339ec98a88f8971c6ec13d5dcb10cb7af780752e97509f e2fsprogs-1.45
4545
139af6684f275e362e5c247bb830e85c888aa6c263622c1f3e967b2f71ff38f4 ed-1.4_0.tar.bz2
4646
ce69ed8b48cf5440d33c756aadefc48711bdf058ead79121176e13fd9e306c50 file-5.44_0.tar.bz2
4747
eec07e0d710ed3dd8d0ba6a1ec6ca9f1fa3a611bbb225195435679175317bf90 findutils-4.2.33_0.tar.bz2
48-
6f2194592682f4a448ccb0aa897e707a8a00eeb69d4b1f5f0236eb6d0fef6242 flex-2.5.11_0.tar.bz2
48+
0fb7580f81433aaf9f560e796799c0875c33a8ddf1da27ea523f6f895a1797e6 flex-2.5.11_0.tar.bz2
4949
9cb13b1e60c2c860e2f6fb11efffa74646290ef8461fbc43ed6e5ccfc3bd673f flex-2.5.33_0.tar.bz2
50-
7bd44ec26cad78e5bb146e5ab709d489b6589da6049e319a4f438603f10eda4b flex-2.6.4_0.tar.bz2
50+
9e898068d570b5cfa016f0e14819d7f7a6577bae9177ef1e9bb62866d5b0f0b9 flex-2.6.4_0.tar.bz2
5151
c925739472260498342ba6dc3263da937abf5237e7e9102622bf5657ec98094a gawk-3.0.4_0.tar.bz2
5252
97e255a5852cb5fbd16e632249787f80e6bfd75cc5b31f8dfc8c81660a0801e1 gawk-5.3.0_0.tar.bz2
5353
ab8b5b92de4780b085d8bc7e98ee72ad5ba9c07b26690c579c559b5cc21817eb gc-8.0.4_0.tar.bz2
@@ -64,7 +64,7 @@ bfeb5cad6720cd6ff629095f562fc7b60e2b352d248c4f8bdc9de3db1ed09b17 grep-3.7_0.tar
6464
3f08414ffc65cebc8a635b0339f95c7ea0259d33cb53676293c3b28b0453f8c1 grub-2.06_0.tar.bz2
6565
fc97b59e6b3a99ef457890a00ddee4a9ad44316e41cb746cf6cac1d193e480b7 guile-3.0.9_0.tar.bz2
6666
4b784b57ed27e22750cf79492bb65bf68bd8211d942eeb74490981effa41196b gzip-1.13_0.tar.bz2
67-
d0cb00116d742d4216af4a7ed47f20408640229909a497c184aed3d4fcd4f30a heirloom-devtools-070527_0.tar.bz2
67+
30910d1d4af913272a46d76e824155bf3d023347a940db03837250000c17bab5 heirloom-devtools-070527_0.tar.bz2
6868
8d2015b87337abbf287f7a39ee4cf53514120b5d3e90a93fe7d533dcc43f14fa help2man-1.36.4_0.tar.bz2
6969
f59be8342ecf28d94e07c862de2d04dc46a7f9415e5256360d0e2ea6d1e3b252 kbd-1.15_0.tar.bz2
7070
eaac2e938932926864c3866eb60b05c710137f20bb08b6fbdcba752d729f5b68 kexec-linux-1.0.0_0.tar.bz2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
366f84242bee042ea0919d06f536d48541175ce6fdcfaa238282867c8b85a300 /usr/bin/bash
1+
d6f725a9998443629e9d8496df3ed4a938a9bdc80cd1aab2b31b011b99f0dae4 /usr/bin/bash

steps/byacc-20240109/byacc-20240109.checksums

Lines changed: 0 additions & 1 deletion
This file was deleted.

steps/byacc-20240109/files/Makefile

Lines changed: 0 additions & 98 deletions
This file was deleted.

steps/byacc-20240109/pass1.kaem

Lines changed: 0 additions & 45 deletions
This file was deleted.

steps/byacc-20240109/patches/meslibc.patch

Lines changed: 0 additions & 170 deletions
This file was deleted.

steps/byacc-20240109/sources

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)