From 1ba9c80a3be4d91a088a268fe04f0e0be50d6195 Mon Sep 17 00:00:00 2001 From: Samuel Tyler Date: Sun, 21 Dec 2025 22:04:44 +1100 Subject: [PATCH] Install each bison with different symlinks --- steps/bison-3.4.1/mk/main.mk | 9 ++++----- steps/bison-3.4.1/pass3.sh | 6 ++++++ steps/bison-3.4.2/sources | 2 -- steps/bison-3.6.4/pass1.sh | 6 +++++- steps/bison-3.7.6/pass1.sh | 6 +++++- steps/bison-3.8.2/pass1.sh | 6 +++++- steps/gettext-0.21/pass1.sh | 8 +++++++- steps/manifest | 2 +- 8 files changed, 33 insertions(+), 12 deletions(-) delete mode 100644 steps/bison-3.4.2/sources diff --git a/steps/bison-3.4.1/mk/main.mk b/steps/bison-3.4.1/mk/main.mk index f6a6d182..587021d6 100644 --- a/steps/bison-3.4.1/mk/main.mk +++ b/steps/bison-3.4.1/mk/main.mk @@ -21,8 +21,7 @@ bison: src.a lib.a FORCE: install: - install -D bison $(DESTDIR)$(PREFIX)/bin/bison - rm -rf $(PREFIX)/share/bison - install -d $(DESTDIR)$(PREFIX)/share/bison - mv data/skeletons/ $(DESTDIR)$(PREFIX)/share/bison - mv data/m4sugar/ $(DESTDIR)$(PREFIX)/share/bison + install -D bison-3.4 $(DESTDIR)$(PREFIX)/bin/bison-3.4 + 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 e863adff..34ee2022 100755 --- a/steps/bison-3.4.1/pass3.sh +++ b/steps/bison-3.4.1/pass3.sh @@ -20,3 +20,9 @@ src_prepare() { src_compile() { make -j1 -f Makefile PREFIX="${PREFIX}" } + +src_install() { + default + + ln -s bison-3.4 "${DESTDIR}${PREFIX}/bin/bison" +} diff --git a/steps/bison-3.4.2/sources b/steps/bison-3.4.2/sources deleted file mode 100644 index 5b3fdf25..00000000 --- a/steps/bison-3.4.2/sources +++ /dev/null @@ -1,2 +0,0 @@ -f http://mirrors.kernel.org/gnu/bison/bison-3.4.2.tar.xz 27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0 -g https://https.git.savannah.gnu.org/git/gnulib.git~672663a _ 8cced51f89a950472473856f86e88f5daf97a2347756125ccdc8ee907deec570 gnulib-672663a.tar.gz diff --git a/steps/bison-3.6.4/pass1.sh b/steps/bison-3.6.4/pass1.sh index 8986e4da..f5605b43 100755 --- a/steps/bison-3.6.4/pass1.sh +++ b/steps/bison-3.6.4/pass1.sh @@ -35,7 +35,9 @@ src_prepare() { src_configure() { ./configure --prefix="${PREFIX}" \ --libdir="${LIBDIR}" \ - --disable-nls + --disable-nls \ + --program-suffix=-3.6 \ + --datarootdir="${PREFIX}/share/bison-3.6" } src_compile() { @@ -44,4 +46,6 @@ src_compile() { src_install() { make MAKEINFO=true DESTDIR="${DESTDIR}" install + + ln -s bison-3.6 "${DESTDIR}${PREFIX}/bin/bison" } diff --git a/steps/bison-3.7.6/pass1.sh b/steps/bison-3.7.6/pass1.sh index 79541139..db6922ea 100755 --- a/steps/bison-3.7.6/pass1.sh +++ b/steps/bison-3.7.6/pass1.sh @@ -32,7 +32,9 @@ src_prepare() { src_configure() { ./configure --prefix="${PREFIX}" \ --libdir="${LIBDIR}" \ - --disable-nls + --disable-nls \ + --program-suffix=-3.7 \ + --datarootdir="${PREFIX}/share/bison-3.7" } src_compile() { @@ -41,4 +43,6 @@ src_compile() { src_install() { make MAKEINFO=true DESTDIR="${DESTDIR}" install + + ln -s bison-3.7 "${DESTDIR}${PREFIX}/bin/bison" } diff --git a/steps/bison-3.8.2/pass1.sh b/steps/bison-3.8.2/pass1.sh index 45e012db..e4c4d224 100755 --- a/steps/bison-3.8.2/pass1.sh +++ b/steps/bison-3.8.2/pass1.sh @@ -32,7 +32,9 @@ src_prepare() { src_configure() { ./configure --prefix="${PREFIX}" \ --libdir="${LIBDIR}" \ - --disable-nls + --disable-nls \ + --program-suffix=-3.8 \ + --datarootdir="${PREFIX}/share/bison-3.8" } src_compile() { @@ -41,4 +43,6 @@ src_compile() { src_install() { make MAKEINFO=true DESTDIR="${DESTDIR}" install + + ln -s bison-3.8 "${DESTDIR}${PREFIX}/bin/bison" } diff --git a/steps/gettext-0.21/pass1.sh b/steps/gettext-0.21/pass1.sh index 9be5acc2..471b17f7 100755 --- a/steps/gettext-0.21/pass1.sh +++ b/steps/gettext-0.21/pass1.sh @@ -17,7 +17,13 @@ src_prepare() { } src_configure() { - ./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" --enable-static --disable-shared --disable-java + INTLBISON=bison-3.6 \ + TOOLS_BISON=bison-3.6 \ + ./configure --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --enable-static \ + --disable-shared \ + --disable-java } src_compile() { diff --git a/steps/manifest b/steps/manifest index 7a02f155..7344f3b8 100644 --- a/steps/manifest +++ b/steps/manifest @@ -174,7 +174,6 @@ build: automake-1.16.3 build: autoconf-2.71 build: bison-3.6.4 build: bison-3.7.6 -build: bison-3.8.2 build: perl-Devel-Tokenizer-C-0.11 build: perl-5.22.4 build: perl-Devel-Tokenizer-C-0.11 @@ -183,6 +182,7 @@ build: perl-Devel-Tokenizer-C-0.11 build: perl-5.30.3 build: perl-Devel-Tokenizer-C-0.11 build: perl-5.36.3 +build: bison-3.8.2 build: perl-Devel-Tokenizer-C-0.11 build: perl-5.42.0 uninstall: perl-5.6.2 perl-5.8.9