From 501ca4da87a1053954ceacb1c15447509266f96e Mon Sep 17 00:00:00 2001 From: Samuel Tyler Date: Mon, 22 Dec 2025 19:27:35 +1100 Subject: [PATCH] Also fix up bison 3.4.1 --- steps/SHA256SUMS.pkgs | 34 ++++++++++++++-------------- steps/bison-3.4.1/files/configmake.h | 2 +- steps/bison-3.4.1/mk/main.mk | 3 ++- steps/bison-3.4.1/pass3.sh | 6 ----- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index 569c8ea4..7412e6e1 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -7,7 +7,7 @@ b687370caaa654ba2fc622188240f50ea305a1c926accbced153df9179697adf autoconf-2.53_ 836f0ec53e05a05602d9ef4ae050eb294735337bf647715e227d1b5bc0526c6b autoconf-2.61_0.tar.bz2 7702fe8724549641eb6a03c737f2414faecb23297a5bdb57e42326e98153de41 autoconf-2.64_0.tar.bz2 b363f22b42418fb2507bf722b0a6b5b03410ac58c44c400767d650d828696eaa autoconf-2.69_0.tar.bz2 -20f88c4b56d4a830718c6a64bb8259704cb75353140fe099e91078d7bb1fd9d7 autoconf-2.71_0.tar.bz2 +cde51b816fcce47742064f9dc0b4871e4194190be5065dc1852b39339cc9115b autoconf-2.71_0.tar.bz2 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b autoconf-archive-2021.02.19_0.tar.bz2 df5afd05f14dcc23fba79c5fbfda9694f85e5eae10b842b5cc0b58f0dbac5153 autogen-5.18.16_0.tar.bz2 02a426e82a52d4a2cd7e73fe3dc5a2c58b3ed100f24a92c57e42511fd86e247c automake-1.10.3_0.tar.bz2 @@ -26,9 +26,9 @@ e5a0c306550ccfbea0b0e0a8ac121dfb1439759441916050778c448b02b8b301 bc-1.08.1_0.ta a2b6a2d58245c3897b2335512915a5d0896fd948a8c5881faab7a6473e42cdb1 binutils-2.41_0.tar.bz2 1f63c355042804b86f694b8d3aa79ccf33a1b6e79f80e8b631a137aea25c3142 binutils-2.41_1.tar.bz2 5182bedc1c68f9908ed782dbb0a79c0a5b262fe8b1f9c6eea6d7e7186696827e bison-2.3_0.tar.bz2 -81554c867db75101422797d227dd76c8a12c87246393126542ff92a0b97db6c1 bison-3.4.1_0.tar.bz2 -f7437edc081071cc3ecd3384abf4c63f33183858b8cae6b4ac3105c66f88b3b6 bison-3.4.1_1.tar.bz2 -8064a96c8ccfbab1245554ac30e68fcc73da24a3dd02f8450658fdb106c7f405 bison-3.4.1_2.tar.bz2 +b3b99ebf348f4a3ff1af29e958cab745232d3400d6604ab6ef8450538f6a0738 bison-3.4.1_0.tar.bz2 +7f738ec72f716db3e91de9a9d9b9b4d335b9e5b34d01e8a69f4dc931d977b670 bison-3.4.1_1.tar.bz2 +0f9ae3236faf92452b36adeeee642a0c800e53b01ca45f11d7a8cb3913169a2f bison-3.4.1_2.tar.bz2 ffcd771ba0e4e38ff726cf8d819ac5c0281186ed99a72b5a9d69d5940438e942 bison-3.6.4_0.tar.bz2 0cb9cb64b4baac6c3568bdf05047b37ff42c661fe3f1e7ab1be7de0f44c4c677 bison-3.7.6_0.tar.bz2 a0156d06536936dee9e696cbf6fb41087eaa1ce5cbc5d6e0067d3fd952ba7060 bison-3.8.2_0.tar.bz2 @@ -51,13 +51,13 @@ f6c65eef86aa9f5317396a8443b25ed87a18f72d07dfd2231a594aa2c1a68942 findutils-4.2. 2ba6bfb20ab603787a95bf293742f36cfd8270c616073a880bc6d0c703e2c870 flex-2.5.33_0.tar.bz2 9e898068d570b5cfa016f0e14819d7f7a6577bae9177ef1e9bb62866d5b0f0b9 flex-2.6.4_0.tar.bz2 c925739472260498342ba6dc3263da937abf5237e7e9102622bf5657ec98094a gawk-3.0.4_0.tar.bz2 -b0594412be69fc5e08476c10851d17e19124bdbdc4133c110818a46e2a7c5540 gawk-5.3.0_0.tar.bz2 +e119505fb6218deaaafbf5d31e0ce3dc1e60dae8475fe2a3f9230f9e9e8c7eaf gawk-5.3.0_0.tar.bz2 b4fafdabdbd8c1f9f7c96fc4677023a8151fe2afe0702e3dee920157b30deb98 gc-8.0.4_0.tar.bz2 -a151c33be67b0d41b7470c20b5265c079bf7f83194e859dbdfbed308da9a64bd gcc-10.5.0_0.tar.bz2 -61c5fb7da5c77ea3395a6b56f08c2285c279f6deb10712cce9395643a2373c70 gcc-15.2.0_0.tar.bz2 +1edee9931fd23d02bf3f706cb43de3c141fbd8f9d3a1bf636ed460acaac2c5eb gcc-10.5.0_0.tar.bz2 +a2d4f9099ef92f8bd79f65a384764622a0aa50b5488826aef8a3afef8d57e46b gcc-15.2.0_0.tar.bz2 d34de902de6de9204abedb834c4c39fbb95b993e545fbb090de2b028fa1d4a61 gcc-4.0.4_0.tar.bz2 2f13b3306832d882536c97d0302f2ec1801193086dbbe62388f930858e5728a3 gcc-4.0.4_1.tar.bz2 -2c5268956c09c71efd6c793773dd2d8133274b6c846ec63cd67218af9080bd3d gcc-4.7.4_0.tar.bz2 +c523aff079101ce282793efc00934cf2ca20de58109a42746002c112c526b65f gcc-4.7.4_0.tar.bz2 b1df809b03347ae8360162c512bd7589611e735638c795cc54f0f032a8439727 gettext-0.21_0.tar.bz2 96f33b53c24f5f46a23c2b9eef8147e684c796889a83bdd39254a73393594a49 gmp-6.2.1_0.tar.bz2 8138c02c4fef718c97827f1d6476e2fc83433ff06eff4820b53589b5419b7e15 gperf-3.1_0.tar.bz2 @@ -86,7 +86,7 @@ d4dff784cac3d58d0cedfd9a51b52ff100ad8654e10a7c8c41590351f48f57d6 m4-1.4.7_0.tar 38611790ea602063095c2819672932cbfbc29cd1244b68a8f46123e76a1ad630 make-3.82_0.tar.bz2 d477947e4df6f4964fae00c9c16850caf0c8e3b09771007fcca1fec8f6da9d6e make-4.2.1_0.tar.bz2 88318fd096fe26688f8e56a77f303b24eaa5674f1b77d9bd0d0538066a0e6f99 mpc-1.2.1_0.tar.bz2 -84bc11e89ab9427be5b142e51cfaba7565d88738e5373bb7f59fb6a8d74aba6c mpfr-4.1.0_0.tar.bz2 +d62c1bc02f67f12a1240390b9aae0ff3708229d660b9780dca5bf5e77867407c mpfr-4.1.0_0.tar.bz2 becc0745a5a4b831dca4d4d8a6c463452922739832f66760e8238e6486039832 musl-1.1.24_0.tar.bz2 ed34943339fea3ff414e851134dc2f32b68221e8eeead0ec675eeb2a9208447d musl-1.1.24_1.tar.bz2 ded6ecc93cc194f5b22be26c6547c63a4b84959785212fded100440f71da1802 musl-1.1.24_2.tar.bz2 @@ -129,15 +129,15 @@ d2f1e838b9ed58d58c0d6594dd868af49b576b1d6ef05903a43ad33d4986b32d perl-Devel-Tok dfd2e494cc1c13ac241668d7489895984100bd14848281d2a4881d15436525fc pkg-config-0.29.2_0.tar.bz2 541d75be65f3daedc44df145556aacb3debbb7029635d8ccc9e96d839c8c6815 python-2.0.1_0.tar.bz2 5bd6c35b4d6003ce5d9fb7223816aad6bf2de66cabe97f31d7b27bfb5cc3b4f3 python-2.0.1_1.tar.bz2 -b5d0789b8899f66b6a68a6127611191fe9819a78e2fe24fce95800de73172053 python-2.3.7_0.tar.bz2 -df4370976a994c42207ef2da073a5f1864d791d4fc9a01136e9e080b0f9c873c python-2.3.7_1.tar.bz2 -a45cee0c21ca6da3f5bd0ab3d12e15ec87afeebe8e22d8d79864f88769e50201 python-2.5.6_0.tar.bz2 +c6c183bcb738bc8f9c1b25d9abc440fc53aee3e710b83f369aafd67ae282db56 python-2.3.7_0.tar.bz2 +2914530a437c138d125d9d167e3b1615e46e4d85195a9a1f9998c267deb76b3f python-2.3.7_1.tar.bz2 +b482ef7d4f6dc39045612927514f6ef5d8af4326a965474b7967772fff23d929 python-2.5.6_0.tar.bz2 f9f4b4a3ac4a98464774f04725a1028371f25d158c4fd06b26a35eaf7445e871 python-3.11.1_0.tar.bz2 -b9fdc41ef8f9d131c41163d8e57c89efbf1aac59b8c073da8c8408bb7738a700 python-3.1.5_0.tar.bz2 -8c4ac185637d273d28541a90780324208f43f42ed56f948cd2d677a5fa20a900 python-3.1.5_1.tar.bz2 -56bf0daae7eeb2d47a8f27b92cd4be6ea8aef35df4ef00972c4c2ac8a01a7aff python-3.3.7_0.tar.bz2 -b76aa9709693f3ce91f37f69d67cf73e1a2cf6247073dbe6f6945b401295acb3 python-3.4.10_0.tar.bz2 -a0d94e3e4868bd9ae88cf5ff0cecb5bbfcfe1802b1979f44dc0579e44ab1775e python-3.8.16_0.tar.bz2 +58248e8651077a102bc4fa24bba50adfa8187cf5fb4418e2861170298cfd94cd python-3.1.5_0.tar.bz2 +2488142631673ad697ab2da05e14839ccee9e9507d149300dfe3e209d5d4396f python-3.1.5_1.tar.bz2 +3476ee694dd27f2a865859da9c7a739a7a4bd9e69355fdb9d5d13fb272766ddd python-3.3.7_0.tar.bz2 +16a2e5de2dbbc9e52501dcea067cf4b7bd5d7c4c89f61beab7ff4c8804053ba2 python-3.4.10_0.tar.bz2 +1046b69b1e6aea31fa6fc31d6fa1df69d0013584ebdd87f23cafa194817ebab3 python-3.8.16_0.tar.bz2 18d517fa1195aa82e3e0eb7f261eb3addb9a43492040b16be04571639781577e sed-4.0.9_0.tar.bz2 3e7c9ab6da24fa44e115af66e077b5692f5293ffb7bc82c54fb91663900867d3 sed-4.8_0.tar.bz2 fe8bbc246d82e99c482337f1443c5313268823667dccebca6cd004e6cf6b4a7c shadow-4.14.3_0.tar.bz2 diff --git a/steps/bison-3.4.1/files/configmake.h b/steps/bison-3.4.1/files/configmake.h index 0e3de614..8e5fe37f 100644 --- a/steps/bison-3.4.1/files/configmake.h +++ b/steps/bison-3.4.1/files/configmake.h @@ -4,4 +4,4 @@ // SPDX-License-Identifier: GPL-3.0-or-later #define LOCALEDIR "/usr/share/locale" -#define PKGDATADIR "/usr/share/bison" +#define PKGDATADIR "/usr/share/bison-3.4" diff --git a/steps/bison-3.4.1/mk/main.mk b/steps/bison-3.4.1/mk/main.mk index 587021d6..1a8996db 100644 --- a/steps/bison-3.4.1/mk/main.mk +++ b/steps/bison-3.4.1/mk/main.mk @@ -21,7 +21,8 @@ bison: src.a lib.a FORCE: install: - install -D bison-3.4 $(DESTDIR)$(PREFIX)/bin/bison-3.4 + install -D bison $(DESTDIR)$(PREFIX)/bin/bison-3.4 + ln -s bison-3.4 $(DESTDIR)$(PREFIX)/bin/bison install -d $(DESTDIR)$(PREFIX)/share/bison-3.4 mv data/skeletons/ $(DESTDIR)$(PREFIX)/share/bison-3.4 mv data/m4sugar/ $(DESTDIR)$(PREFIX)/share/bison-3.4 diff --git a/steps/bison-3.4.1/pass3.sh b/steps/bison-3.4.1/pass3.sh index 34ee2022..e863adff 100755 --- a/steps/bison-3.4.1/pass3.sh +++ b/steps/bison-3.4.1/pass3.sh @@ -20,9 +20,3 @@ src_prepare() { src_compile() { make -j1 -f Makefile PREFIX="${PREFIX}" } - -src_install() { - default - - ln -s bison-3.4 "${DESTDIR}${PREFIX}/bin/bison" -}