From eb493056dacaa206b18da97515d801661acc339d Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Fri, 6 Jun 2025 01:51:09 -0500 Subject: [PATCH 1/2] fix(scripts/setup-termux): install `bison`, not `byacc` - Partial fix (one part of the fix for) https://github.com/termux/termux-packages/issues/21658 - Partially reverts https://github.com/termux/termux-packages/commit/cd151f284152bcb5e2a6f3bc073d32858c0b7da2 - The Ubuntu termux-package-builder docker container contains `bison`, **not** `byacc` https://github.com/termux/termux-packages/blob/dfb980969307f853d1ce6f3eab4b49358623526d/scripts/setup-ubuntu.sh#L33 - Many Termux packages, for one example `mesa`, cannot be built without having `bison` installed, rather than `byacc` --- scripts/setup-termux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup-termux.sh b/scripts/setup-termux.sh index d8f38ad130a59e..30d6f764bd1577 100755 --- a/scripts/setup-termux.sh +++ b/scripts/setup-termux.sh @@ -18,7 +18,7 @@ PACKAGES+=" asciidoctor" PACKAGES+=" autoconf" PACKAGES+=" automake" PACKAGES+=" bc" -PACKAGES+=" byacc" +PACKAGES+=" bison" PACKAGES+=" bsdtar" # Needed to create pacman packages PACKAGES+=" cmake" PACKAGES+=" ed" From 57a351038f6dcd2cecaa26dab605507898654f13 Mon Sep 17 00:00:00 2001 From: Robert Kirkman Date: Fri, 6 Jun 2025 03:25:42 -0500 Subject: [PATCH 2/2] fix(main/nethack): apply on-device-required patches before hostbuild - Fixes this error when building `nethack` on-device: `make: lex: No such file or directory` [no ci] --- ...file.utl.patch => sys-unix-Makefile.utl.patch.beforehostbuild} | 0 ...{util-recover.c.patch => util-recover.c.patch.beforehostbuild} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename packages/nethack/{sys-unix-Makefile.utl.patch => sys-unix-Makefile.utl.patch.beforehostbuild} (100%) rename packages/nethack/{util-recover.c.patch => util-recover.c.patch.beforehostbuild} (100%) diff --git a/packages/nethack/sys-unix-Makefile.utl.patch b/packages/nethack/sys-unix-Makefile.utl.patch.beforehostbuild similarity index 100% rename from packages/nethack/sys-unix-Makefile.utl.patch rename to packages/nethack/sys-unix-Makefile.utl.patch.beforehostbuild diff --git a/packages/nethack/util-recover.c.patch b/packages/nethack/util-recover.c.patch.beforehostbuild similarity index 100% rename from packages/nethack/util-recover.c.patch rename to packages/nethack/util-recover.c.patch.beforehostbuild