diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index b7a78c7..9d163a8 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -68,3 +68,4 @@ b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb bison-2.3.tar. 0190f28cb155fedd22bf8558c3e8705eed9eacfb7ae29e7508d025a68eb90899 gnulib-b28236b.tar.gz 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826 perl-5.10.1.tar.bz2 54437ae4211867de7ad55723f68b94c29cb2f08a23f431e0bbbc9f34ee384f47 dist-3.5-236.tar.gz +e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 make-4.2.1.tar.gz diff --git a/parts.rst b/parts.rst index f4e5c5a..e8c4e1b 100644 --- a/parts.rst +++ b/parts.rst @@ -604,6 +604,15 @@ tar 1.34 Newer tar has better support for decompressing .tar.bz2 and .tar.xz archives. It also deals better with modern tar archives with extra metadata. +make 4.2.1 +========== + +A newer version of make built using autotools is much more reliable and is +compiled using a modern C compiler and C library. This removes a couple of +segfaults encountered later in the process and allows more modern make features +to be used. We do not go for the latest because of the use of automake 1.16 +which we do not have yet. + gmp 6.2.1 ========= diff --git a/sysa/make-4.2.1/checksums b/sysa/make-4.2.1/checksums new file mode 100644 index 0000000..e663e90 --- /dev/null +++ b/sysa/make-4.2.1/checksums @@ -0,0 +1 @@ +c52511b504311f960636173d825a985ac551f6254fb85dced27fdae74ee652c4 /after/bin/make diff --git a/sysa/make-4.2.1/make-4.2.1.sh b/sysa/make-4.2.1/make-4.2.1.sh new file mode 100755 index 0000000..6bc919d --- /dev/null +++ b/sysa/make-4.2.1/make-4.2.1.sh @@ -0,0 +1,30 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + rm doc/make.info + touch doc/make.info + + # We don't have autopoint from gettext yet + AUTOPOINT=true autoreconf -fi +} + +src_configure() { + ./configure \ + --prefix="${PREFIX}" \ + --target=i386-unknown-linux-gnu \ + --host=i386-unknown-linux-gnu \ + --build=i386-unknown-linux-gnu \ + --disable-nls +} + +src_compile() { + make MAKEINFO="true" +} + +src_install() { + make install MAKEINFO="true" DESTDIR="${DESTDIR}" +} diff --git a/sysa/make-4.2.1/patches/pkg-config.patch b/sysa/make-4.2.1/patches/pkg-config.patch new file mode 100644 index 0000000..a30392e --- /dev/null +++ b/sysa/make-4.2.1/patches/pkg-config.patch @@ -0,0 +1,28 @@ +SPDX-FileCopyrightText: 2021 fosslinux + +SPDX-License-Identifier: GPL-3.0-or-later + +pkg-config is not yet avaliable. + +--- configure.ac 2021-04-21 17:02:44.864090500 +1000 ++++ configure.ac 2021-04-21 17:03:31.468411937 +1000 +@@ -160,19 +160,9 @@ + AC_FUNC_CLOSEDIR_VOID + + # See if the user wants to add (or not) GNU Guile support +-PKG_PROG_PKG_CONFIG + AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile], + [Support GNU Guile for embedded scripting])]) + +-# For some strange reason, at least on Ubuntu, each version of Guile +-# comes with it's own PC file so we have to specify them as individual +-# packages. Ugh. +-AS_IF([test "x$with_guile" != xno], +-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], +- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes], +- [have_guile=no])]) +-]) +- + AS_IF([test "$have_guile" = yes], + [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])]) + diff --git a/sysa/run2.sh b/sysa/run2.sh index 94ff2fb..edd8a86 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -26,6 +26,8 @@ build coreutils-8.32 build tar-1.34 +build make-4.2.1 + build gmp-6.2.1 build autoconf-archive-2021.02.19