Add libtool 2.4.7

Instead of using the pre-generated "bootstrap" script, execute the relevant bootstrap operations manually. This doesn't actually change the build output; the final package hash remains identical.
2022-09-04 11:06:28 +03:00 · 2022-09-04 11:06:28 +03:00 · 5aae443d65
parent e9d53f1e6e
commit 5aae443d65
9 changed files with 229 additions and 11 deletions
--- a/parts.rst
+++ b/parts.rst
@ -1,4 +1,5 @@
 .. sectnum::
+.. SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
 .. SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
 .. SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
 .. SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
@ -609,6 +610,12 @@ automake 1.11.2
 GNU Automake from 1.11 series. This is not the latest point release as newer ones
 need Autoconf 2.68.

+libtool 2.4.7
+=============
+
+A modern version of libtool with better compatiblitiy with newer versions of GNU
+Autotools.
+
 autoconf 2.69
 =============

--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@ -37,7 +37,7 @@ c4d59e759f7349b96f74e62d867e419f3d85fbb81eaf5f79f996abf48f0d3170  coreutils-5.0_
 776ef3e13870fba6fc9cec64eaf40fb658abecc99c65724968013f8f8a177802  coreutils-6.10_0.tar.bz2
 b8992f675350658b106c3066cac0ee31440020bc9d6128bfc2fdf1fde60efd74  coreutils-8.32_0.tar.bz2
 28a1e93ed14f7fa4d3c8ca41e9b78e29ba685fbc8b6bf7ba3b6933770d68eedb  curl-7.83.0_0.tar.bz2
-99a101a3a1de8e5ed3f590cda6b1a72d68cd2e935b85e8b9b862ab26f66c7ee1  curl-7.83.0_1.tar.bz2
+7587f57c2dbfd67c568dbf91774676a8e250eadc93764bc74b902f61253e97c4  curl-7.83.0_1.tar.bz2
 a6f8f4db6bf449ed8771efefabb88833f1fc5f314d565b7714c9c8b4ba34b20c  dhcpcd-9.4.1_0.tar.bz2
 ca91a67d5d0c0ee46d064d9bf7c26efcafe712a9f86866991028478df3b34f21  diffutils-2.7_0.tar.bz2
 de6d9df33107ae63b8e0f30902fe9d00e42f78f44a60b256bb0b3c82ff75bd45  dist-3.5-236_0.tar.bz2
@ -47,31 +47,32 @@ f55c11b091361536774b436abe86b17f759cd7a66522cd20c7a2190da92db67a  findutils-4.2.
 33afd1c66c864b486df290e682883556787c61751b8c851deb2737f0b777ffd6  flex-2.5.33_0.tar.bz2
 000147c1a33feff5c5b4cb10c2cf6c2b2f4ef92a90c9e659b25f1766a83d4afc  flex-2.6.4_0.tar.bz2
 92fe0ffd0971a40fd98c70b075d5bb12f2d8093ef8fb3333aac2b532bd53a591  gawk-3.0.4_0.tar.bz2
-95a787e432b40497b39909aa533a2b19c1b05a87bc3a289b338e4fec44e94f96  gc-8.0.4_0.x86.xbps
+3ab628221001e94dedfe1415079651d1bbfa6815602a8661728f8b8049fc6e57  gc-8.0.4_0.x86.xbps
 07715a0c8bc13b80fc10ede20573f92e933b8d3dc6a5c8700f4289965ea8ec74  gcc-4.0.4_0.tar.bz2
 e7c678c71c51cd6e8ce6eae029503a661169e6994ba0f988ac15634254d1fadb  gcc-4.0.4_1.tar.bz2
-03aa62a03becd1688dd6ccb28da4b924d928796807af86b83aa2d01bab1c9f65  gcc-4.7.4_0.x86.xbps
+53b03122b399b1c5c2427aa735e42d661157d9369c3023a3fe45e87001e2a973  gcc-4.7.4_0.x86.xbps
 b5f6fe07a696751d2fc1d9cc3d96f09d89d6a637e1d8d0b250105b650e831600  gettext-0.21_0.x86.xbps
-ed8b1b36fa558f594b3e4b5a958f1c31d97990abf84788f67ce5be7a593c4b9d  gmp-6.2.1_0.tar.bz2
+fe16fb6021f1f4650c98f77261145f37732be0aee06e957b0bdb3b01beb593a8  gmp-6.2.1_0.tar.bz2
 11940cfe5ea1c11f427932faecf054e1463f8b674a3dd99ef1569b245a370035  gperf-3.1_0.x86.xbps
 390840f2bc9c2a3196c28e06f8650f408e33b5d4ffe5539e174682ed13960bc9  grep-2.4_0.tar.bz2
-4c5ac95c3ca934d5cac5e05e13473a16ee1a616190217795438019f1e4fcc254  guile-3.0.7_0.x86.xbps
+3d6a86dcfcc9cf9ad11f07cc2a2adaa8bfec0d593df1ee5f33d59f7c63b8ea32  guile-3.0.7_0.x86.xbps
 ec6b32cba3f49f860a3d9b97cea57931869c5849d8ca5ad0ea01dad45b9edb91  help2man-1.36.4_0.tar.bz2
 2ef01fe7252be680382bee5df890ad3f6dae26744104ccdaa2d1236bc19ab44a  kbd-1.15_0.tar.bz2
 68c272b50a99e4d53cab57552337e7660020a47c06a0341efcdfa4f2441db187  kexec-tools-2.0.22_0.tar.bz2
-a4aa859bdb70b5c0c9b726fe8f1a34c08b5afc1fe1bc8d0d2be136c7f8b36d85  libarchive-3.5.2_0.tar.bz2
-a80d0ff829ab285e92d966b3664e390ce60b420eb22b1288211432fed880b4fe  libatomic_ops-7.6.10_0.x86.xbps
-b70fe8d9479ca4a3ad6fdbafbaf52a172c6a4a47ae8cf080beb9d25b97a7b205  libffi-3.3_0.x86.xbps
+4c0cc86a9855122a4b5c12bff6f6bbf524495910ec718ef339fbfe7076824950  libarchive-3.5.2_0.tar.bz2
+95506b7151440ec7ed7af9769784f312cb4c37deaf7a6c66e2b6d36c403e4b3c  libatomic_ops-7.6.10_0.x86.xbps
+d242816dac83ea56c4be79d289b0b4e56b8257a9f9986ddbcfabc8dfaea3687a  libffi-3.3_0.x86.xbps
 5001f8fdbba0db0ecf60263bfea97ed4b9174d06a447e98bee220548f973756a  libtool-1.4_0.tar.bz2
 94d0f9d2f8fbc2b00fe4c0f479e5590fa70b7d856f0a643ad006787d963f99ee  libtool-2.2.4_0.tar.bz2
-9bf0aea34d1413640667645ef06947ec2c24d3fa4e4e10825a7560c6d2e3343b  libunistring-0.9.10_0.x86.xbps
+374214711d42681d030d6faceba3198243ec22301d94212f7162bd4873b7ba27  libtool-2.4.7_0.tar.bz2
+482708d01357ee4de3f17c54047fe8ab6c502fc436069da63e3ef56c24d944b2  libunistring-0.9.10_0.x86.xbps
 1d07aaf7049be45853fd409340cdb52bb3a1b6dfa4dbc8b69358c1ee966cd67f  linux-4.9.10_0.tar.bz2
 61507b58074a3742191b606f9415f79406e5daa693ab4ba4a4543897696628ea  linux-headers-5.10.41_0.tar.bz2
 5cda10550198e613c426e45c5fffe0f7e8761296e7339e9e9a1f9da995b4865a  m4-1.4.7_0.tar.bz2
 c4fc071e0911a01efae11b8735c8e69a8963d9a545befffd01486de7589b201a  make-3.82_0.tar.bz2
 47470be468d66a85e71cbecbbf22038260c6e91408105ba0684c3ee61b39085f  make-4.2.1_0.tar.bz2
-0f88b1715bde14c5d65ffeff54903fae5a11cd02d0e95cad9629c76d42e8d739  mpc-1.2.1_0.tar.bz2
-9ca09072cdee6ce6822840b9a5b66cea3e68150ce4875b2c7e760169601ab6de  mpfr-4.1.0_0.tar.bz2
+3205490c472448de2f67aee7ff3190bb9ac493eca6fc5c8ce79b145d8b23268a  mpc-1.2.1_0.tar.bz2
+ffeadd2b9d9e72edb5b15750b50a6c0c47bb90a1cb14ba66732aa733e0209e50  mpfr-4.1.0_0.tar.bz2
 5a36e7d798f43088d6a72fede0bd0f389a42d9e958013cd6c8df16ce2e090e1f  musl-1.1.24_0.tar.bz2
 7f3251ee05aaa38e9803db41104acbfa399873a31591411c3580d181a6461d0c  musl-1.1.24_1.tar.bz2
 9f3d2b47634860cfd5f03fa3346ef9a60a6dab57164ee974578dbb7f4a45e16b  musl-1.1.24_2.tar.bz2
--- a/sysc.py
+++ b/sysc.py
@ -89,6 +89,10 @@ class SysC(SysGeneral):
        # automake 1.11.2
        self.get_file("https://mirrors.kernel.org/gnu/automake/automake-1.11.2.tar.bz2")

+        # libtool 2.4.7
+        self.get_file(["https://mirrors.kernel.org/gnu/libtool/libtool-2.4.7.tar.xz",
+                       "https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-a521820.tar.gz"])
+
        # autoconf 2.69
        self.get_file("https://mirrors.kernel.org/gnu/autoconf/autoconf-2.69.tar.xz")

--- a/sysc/SHA256SUMS.sources
+++ b/sysc/SHA256SUMS.sources
@ -20,6 +20,7 @@ df807e694deea2dcba0c43af318394f3e3fcd52658c3b71b61dad0ce0c0cfb77  gnulib-30820c.
 8cced51f89a950472473856f86e88f5daf97a2347756125ccdc8ee907deec570  gnulib-672663a.tar.gz
 2d911c2f2ed97b347d6d360b742abdc98aa626d4f8f847ee682c7cde12e90871  gnulib-7daa86f.tar.gz
 f9aad85de1f41d57c9368d304020ffbf354a5e56db1297f022c3d12181134e56  gnulib-901694b9.tar.gz
+719b399fe09a8f6ca14ba8c4a9a60ce9f93f4892effb50961ef3d8cd1a33ff65  gnulib-a521820.tar.gz
 0190f28cb155fedd22bf8558c3e8705eed9eacfb7ae29e7508d025a68eb90899  gnulib-b28236b.tar.gz
 1aeea67b7b3883ebcf2b90bc01f4182d7de073a052dabd3749f20c5aa4ad3e27  gnulib-b81ec69.tar.gz
 12cfa21abf618a274017d6b18e95fc6582519d7c08e2403e5c5772ccdd5b85f4  gnulib-d279bc.tar.gz
@ -30,6 +31,7 @@ f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7  guile-3.0.7.ta
 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0  libarchive-3.5.2.tar.xz
 587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af  libatomic_ops-7.6.10.tar.gz
 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056  libffi-3.3.tar.gz
+4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d  libtool-2.4.7.tar.xz
 eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7  libunistring-0.9.10.tar.xz
 e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7  make-4.2.1.tar.gz
 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459  mpc-1.2.1.tar.gz
--- a/sysc/libtool-2.4.7/bootstrap-helper.sh
+++ b/sysc/libtool-2.4.7/bootstrap-helper.sh
@ -0,0 +1,100 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
+# SPDX-FileCopyrightText: 2010-2019, 2021 Bootstrap Authors
+# SPDX-FileCopyrightText: 2010-2019, 2021-2022 Free Software Foundation, Inc.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+EXIT_FALURE=1
+
+#######################################
+#  Extracted from the output of:      #
+#      ./bootstrap --verbose --force  #
+#######################################
+
+MAKE='make'
+SED='/usr/bin/sed'
+
+build_aux='build-aux'
+ltdl_dir='libltdl'
+macro_dir='m4'
+
+package_name='GNU Libtool'
+package='libtool'
+package_bugreport='bug-libtool@gnu.org'
+package_url='http://www.gnu.org/s/libtool/'
+package_version='2.4.7'
+
+#############################
+#  Inspired by "bootstrap"  #
+#############################
+
+func_show_eval ()
+{
+    eval "$1"
+    _G_status=$?
+    if test 0 -ne "$_G_status"; then
+      exit $_G_status
+    fi
+}
+
+##################################
+#  Copied from "bootstrap.conf"  #
+##################################
+
+# libtool_build_prerequisites
+# ---------------------------
+# Libtool generates some files that are required before any autotools
+# can be run successfully.
+libtool_build_prerequisites ()
+{
+    $debug_cmd
+
+    $require_build_aux
+    $require_ltdl_dir
+    $require_macro_dir
+    $require_package
+    $require_package_bugreport
+    $require_package_name
+    $require_package_url
+    $require_package_version
+
+    # Whip up a dirty Makefile:
+    makes='Makefile.am libltdl/ltdl.mk'
+    rm -f Makefile
+    {
+      echo "aux_dir = $build_aux"
+      echo "ltdl_dir = $ltdl_dir"
+      echo "macro_dir = $macro_dir"
+
+      # The following allow us to tie bootstrap-deps output verbosity
+      # into the bootstrap --verbose option:
+      echo 'AM_V_GEN = $(am__v_GEN_$(V))'
+      echo 'am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))'
+      echo 'am__v_GEN_0 = @echo "  GEN     " $@;'
+      echo 'AM_V_at = $(am__v_at_$(V))'
+      echo 'am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))'
+      echo 'am__v_at_0 = @'
+
+      $SED '/^if /,/^endif$/d;/^else$/,/^endif$/d;/^include /d' $makes
+    } > Makefile
+
+    # Building distributed files from configure is bad for automake, so we
+    # generate them here, and have Makefile rules to keep them up to date.
+    func_show_eval "$MAKE V=1 bootstrap-deps \
+        AM_DEFAULT_VERBOSITY=0 `$opt_verbose && echo V=1` \
+        PACKAGE='$package' PACKAGE_BUGREPORT='$package_bugreport' \
+        PACKAGE_NAME='$package_name' PACKAGE_URL='$package_url' \
+        SED='$SED' srcdir=. VERSION='$package_version'"
+    status=$?
+
+    rm -f Makefile
+    test 0 -eq "$status" ||exit $EXIT_FAILURE
+}
+
+###################
+#  Run functions  #
+###################
+
+libtool_build_prerequisites
--- a/sysc/libtool-2.4.7/import-gnulib.sh
+++ b/sysc/libtool-2.4.7/import-gnulib.sh
@ -0,0 +1,34 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set -e
+
+../gnulib-a521820/gnulib-tool \
+    --no-changelog \
+    --avoid=dummy \
+    --libtool \
+    --macro-prefix=GL \
+    --with-tests \
+    --tests-base=gnulib-tests \
+    --aux-dir=build-aux \
+    --m4-base=m4 \
+    --local-dir=gl \
+    --local-dir=gl-mod/bootstrap \
+    --symlink \
+    --import announce-gen \
+        bootstrap \
+        do-release-commit-and-tag \
+        extract-trace \
+        gendocs \
+        git-version-gen \
+        gitlog-to-changelog \
+        gnu-web-doc-update \
+        gnupload \
+        inline-source \
+        maintainer-makefile \
+        options-parser \
+        readme-release \
+        update-copyright
--- a/sysc/libtool-2.4.7/libtool-2.4.7.sh
+++ b/sysc/libtool-2.4.7/libtool-2.4.7.sh
@ -0,0 +1,51 @@
+# SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+urls="http://mirrors.kernel.org/gnu/libtool/libtool-2.4.7.tar.xz
+ http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-a521820.tar.gz"
+
+src_prepare() {
+    default
+
+    rm -f build-aux/ltmain.sh
+    rm -f doc/*.info
+    rm -f bootstrap
+
+    ../../import-gnulib.sh
+
+    LIBTOOLIZE=true AUTOPOINT=true ../../bootstrap-helper.sh
+
+    LIBTOOLIZE=true AUTOPOINT=true AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 AUTOCONF=autoconf-2.64 AUTOHEADER=autoheader-2.64 autoreconf-2.64 -fi
+    LIBTOOLIZE=true AUTOPOINT=true AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 AUTOCONF=autoconf-2.64 AUTOHEADER=autoheader-2.64 autoreconf-2.64 -fi libltdl
+}
+
+src_configure() {
+    ./configure \
+        --prefix="${PREFIX}" \
+        --libdir="${PREFIX}/lib/musl" \
+        --disable-shared \
+        --host=i386-unknown-linux \
+        --target=i386-unknown-linux \
+        --build=i386-unknown-linux \
+        ac_path_EGREP="egrep" \
+        ac_path_FGREP="fgrep" \
+        ac_path_GREP="grep" \
+        ac_path_SED="sed"
+}
+
+src_compile() {
+    make AUTOM4TE=autom4te-2.64 MAKEINFO=true
+}
+
+src_install() {
+    make install MAKEINFO=true DESTDIR="${DESTDIR}"
+
+    sed -i -e "s/{EGREP=.*/{EGREP='egrep'}/" \
+        -e "s/{FGREP=.*/{FREGP='fgrep'}/" \
+        -e "s/{GREP=.*/{GREP='grep'}/" \
+        -e "s/{SED=.*/{SED='sed'}/" \
+        "${DESTDIR}/usr/bin/libtool"
+}
--- a/sysc/libtool-2.4.7/patches/hostname.patch
+++ b/sysc/libtool-2.4.7/patches/hostname.patch
@ -0,0 +1,17 @@
+SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
+SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+
+SPDX-License-Identifier: GPL-2.0-only
+
+Remove hostname from libtool script.
+
+--- m4/libtool.m4	2022-03-17 04:43:39.000000000 +0200
+++ m4/libtool.m4	2022-09-03 20:04:29.687049292 +0300
+@@ -730,7 +730,6 @@
+     cat <<_LT_EOF >> "$cfgfile"
+ #! $SHELL
+ # Generated automatically by $as_me ($PACKAGE) $VERSION
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ 
+ # Provide generalized library-building support services.
--- a/sysc/run2.sh
+++ b/sysc/run2.sh
@ -23,6 +23,8 @@ build xz-5.0.5

 build automake-1.11.2

+build libtool-2.4.7
+
 build autoconf-2.69

 build automake-1.15.1