diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index 501fabe..4b52289 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -44,6 +44,7 @@ df807e694deea2dcba0c43af318394f3e3fcd52658c3b71b61dad0ce0c0cfb77 gnulib-30820c. 0cfbf866bc39c31f25fa0e56af1e56c5e5c92fc1e5d51242ebafef7ea211f3d5 gnulib-8e128e.tar.gz 0190f28cb155fedd22bf8558c3e8705eed9eacfb7ae29e7508d025a68eb90899 gnulib-b28236b.tar.gz 12cfa21abf618a274017d6b18e95fc6582519d7c08e2403e5c5772ccdd5b85f4 gnulib-d279bc.tar.gz +a285dc300c3d9c25cc06e38827ef40f6073ec3b9b0fcb5bba433f943be92d8d4 gnulib-e017871.tar.gz a32032bab36208509466654df12f507600dfe0313feebbcd218c32a70bf72a16 grep-2.4.tar.gz 4d2ce9f314f39c9575f913503b0178d6fb2c92920db8e7b7b176b7bab7980fe6 gzip-1.2.4.tar 9f233d8b78e4351fe9dd2d50d83958a0e5af36f54e9818521458a08e058691ba heirloom-devtools-070527.tar.bz2 @@ -59,6 +60,7 @@ e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 make-4.2.1.tar 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 musl-1.1.24.tar.gz 9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a patch-2.5.9.tar.gz +ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz 1ae43c8d2983404b9eec61c96e3ffa27e7b07e08215c95c015a4ab0095373ef3 perl-5.000.tar.gz 9fa29beb2fc4a3c373829fc051830796de301f32a719d0b52a400d1719bbd7b1 perl-5.003.tar.gz 1184478b298978b164a383ed5661e3a117c48ab97d6d0ab7ef614cdbe918b9eb perl5.004_05.tar.gz diff --git a/parts.rst b/parts.rst index 7dc9854..8343d74 100644 --- a/parts.rst +++ b/parts.rst @@ -688,3 +688,9 @@ automake 1.16.3 =============== GNU Automake from 1.16 series that required newer Perl. + +patch 2.7.6 +=========== + +Our old patch was built with manual makefile and used mes libc. +This is a newer version of which we need in order to import gnulib into gettext. diff --git a/sysa.py b/sysa.py index 9517073..a335db3 100755 --- a/sysa.py +++ b/sysa.py @@ -486,3 +486,7 @@ class SysA: # automake 1.16.3 self.get_file("https://mirrors.kernel.org/gnu/automake/automake-1.16.3.tar.xz") + + # patch 2.7.6 + self.get_file(["https://mirrors.kernel.org/gnu/patch/patch-2.7.6.tar.xz", + "https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-e017871.tar.gz"]) diff --git a/sysa/patch-2.7.6/checksums b/sysa/patch-2.7.6/checksums new file mode 100644 index 0000000..ea2d6ac --- /dev/null +++ b/sysa/patch-2.7.6/checksums @@ -0,0 +1 @@ +7885f8e8f9b41e2239c34053f22cffb31cce08ddbdfb85f03059ac6754db9c37 /after/bin/patch \ No newline at end of file diff --git a/sysa/patch-2.7.6/import-gnulib.sh b/sysa/patch-2.7.6/import-gnulib.sh new file mode 100755 index 0000000..b199cf9 --- /dev/null +++ b/sysa/patch-2.7.6/import-gnulib.sh @@ -0,0 +1,76 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +../gnulib-e017871/gnulib-tool --import \ + --local-dir=gl \ + --lib=libpatch \ + --source-base=lib \ + --m4-base=m4 \ + --doc-base=doc \ + --tests-base=tests \ + --aux-dir=build-aux \ + --makefile-name=gnulib.mk \ + --no-conditional-dependencies \ + --no-libtool \ + --macro-prefix=gl \ + argmatch \ + backupfile \ + clock-time \ + diffseq \ + dirname \ + dup2 \ + errno \ + exitfail \ + extensions \ + faccessat \ + fchmodat \ + fchownat \ + fcntl-h \ + fstatat \ + full-write \ + getdate \ + getopt-gnu \ + gettime \ + git-version-gen \ + gitlog-to-changelog \ + gnupload \ + hash \ + ignore-value \ + intprops \ + largefile \ + linked-list \ + maintainer-makefile \ + malloc \ + manywarnings \ + memchr \ + minmax \ + mkdirat \ + nstrftime \ + openat \ + progname \ + quotearg \ + readlinkat \ + realloc \ + renameat \ + setenv \ + signal \ + size_max \ + ssize_t \ + stat-time \ + stdbool \ + stdlib \ + symlinkat \ + sys_stat \ + tempname \ + time \ + unistd \ + unlinkat \ + update-copyright \ + utimensat \ + verror \ + xalloc \ + xlist \ + xmemdup0 diff --git a/sysa/patch-2.7.6/patch-2.7.6.sh b/sysa/patch-2.7.6/patch-2.7.6.sh new file mode 100755 index 0000000..d288679 --- /dev/null +++ b/sysa/patch-2.7.6/patch-2.7.6.sh @@ -0,0 +1,24 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + ../../import-gnulib.sh + + # bison + rm lib/parse-datetime.c + + autoreconf -fi +} + +src_configure() { + ./configure --prefix="${PREFIX}" +} + +src_compile() { + make MAKEINFO=true +} + +src_install() { + make MAKEINFO=true DESTDIR="${DESTDIR}" install +} diff --git a/sysa/run2.sh b/sysa/run2.sh index 829caa5..f8b2d4c 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -50,6 +50,8 @@ build perl-5.32.1 build automake-1.16.3 +build patch-2.7.6 + if [ "$FORCE_TIMESTAMPS" = True ] ; then echo 'Forcing all files timestamps to be 0 unix time.' canonicalise_all_files_timestamp