From f9d83f3a3560a565df00c2778b534a7aa508504f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 19 Sep 2022 21:45:14 +0100 Subject: [PATCH] Add grep 3.7. --- parts.rst | 5 ++ sysa/SHA256SUMS.pkgs | 1 + sysc.py | 4 ++ sysc/SHA256SUMS.sources | 6 +- sysc/grep-3.7/grep-3.7.sh | 23 ++++++++ sysc/grep-3.7/import-gnulib.sh | 100 +++++++++++++++++++++++++++++++++ sysc/run2.sh | 2 + 7 files changed, 139 insertions(+), 2 deletions(-) create mode 100755 sysc/grep-3.7/grep-3.7.sh create mode 100755 sysc/grep-3.7/import-gnulib.sh diff --git a/parts.rst b/parts.rst index 7a9506d..56e86bc 100644 --- a/parts.rst +++ b/parts.rst @@ -843,3 +843,8 @@ which 2.21 ``which`` shows the full path of (shell) commands. It mostly duplicates bash built-in ``command -v`` but some scripts call ``which`` instead. In particular, ``autogen`` scripts use it. + +grep 3.7 +======== + +Newer ``grep`` will be needed to bootstrap ``autogen``. diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs index c868c0d..b01cdd0 100644 --- a/sysa/SHA256SUMS.pkgs +++ b/sysa/SHA256SUMS.pkgs @@ -56,6 +56,7 @@ f34c959abbf0119b76b58564786887d66e449914c48f4f74fed1cc392bdb7194 gettext-0.21_0 fe16fb6021f1f4650c98f77261145f37732be0aee06e957b0bdb3b01beb593a8 gmp-6.2.1_0.tar.bz2 8910194c89ee6613dd4bdb20b795299bc7b556365588327631edb86340691436 gperf-3.1_0.x86.xbps 390840f2bc9c2a3196c28e06f8650f408e33b5d4ffe5539e174682ed13960bc9 grep-2.4_0.tar.bz2 +3b0cbd8049d1a0222c5fe7dec4735edfd54b85c3a8646e8afb746eac2cad73e4 grep-3.7_0.x86.xbps cb0c913185dbcead7b9657c847dfe88888b2ce565fc117f0c7abe6ff79eb8dd5 guile-3.0.7_0.x86.xbps ec6b32cba3f49f860a3d9b97cea57931869c5849d8ca5ad0ea01dad45b9edb91 help2man-1.36.4_0.tar.bz2 2ef01fe7252be680382bee5df890ad3f6dae26744104ccdaa2d1236bc19ab44a kbd-1.15_0.tar.bz2 diff --git a/sysc.py b/sysc.py index 7a6b6ec..9082637 100755 --- a/sysc.py +++ b/sysc.py @@ -215,3 +215,7 @@ class SysC(SysGeneral): # which 2.21 self.get_file("https://carlowood.github.io/which/which-2.21.tar.gz") + + # grep 3.7 + self.get_file(["https://mirrors.kernel.org/gnu/grep/grep-3.7.tar.xz", + "https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-8f4538a5.tar.gz"]) diff --git a/sysc/SHA256SUMS.sources b/sysc/SHA256SUMS.sources index 7e84260..3a8e6fa 100644 --- a/sysc/SHA256SUMS.sources +++ b/sysc/SHA256SUMS.sources @@ -1,3 +1,4 @@ +0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a 0.59.1.tar.gz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 autoconf-2.69.tar.xz f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 autoconf-2.71.tar.xz e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd autoconf-archive-2021.02.19.tar.xz @@ -20,6 +21,7 @@ df807e694deea2dcba0c43af318394f3e3fcd52658c3b71b61dad0ce0c0cfb77 gnulib-30820c. 009989b81c0bebc5f6550636ed653fbcb237dafc2af5c706f3522087ca571e4d gnulib-52a06cb3.tar.gz 8cced51f89a950472473856f86e88f5daf97a2347756125ccdc8ee907deec570 gnulib-672663a.tar.gz 2d911c2f2ed97b347d6d360b742abdc98aa626d4f8f847ee682c7cde12e90871 gnulib-7daa86f.tar.gz +e207c0bb72093c3a72dde302fcfaa1dbda12a62172d47b73565883a92209ebab gnulib-8f4538a5.tar.gz f9aad85de1f41d57c9368d304020ffbf354a5e56db1297f022c3d12181134e56 gnulib-901694b9.tar.gz 719b399fe09a8f6ca14ba8c4a9a60ce9f93f4892effb50961ef3d8cd1a33ff65 gnulib-a521820.tar.gz 0190f28cb155fedd22bf8558c3e8705eed9eacfb7ae29e7508d025a68eb90899 gnulib-b28236b.tar.gz @@ -27,6 +29,7 @@ f9aad85de1f41d57c9368d304020ffbf354a5e56db1297f022c3d12181134e56 gnulib-901694b 12cfa21abf618a274017d6b18e95fc6582519d7c08e2403e5c5772ccdd5b85f4 gnulib-d279bc.tar.gz a285dc300c3d9c25cc06e38827ef40f6073ec3b9b0fcb5bba433f943be92d8d4 gnulib-e017871.tar.gz 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 gperf-3.1.tar.gz +5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c grep-3.7.tar.xz 14cda9c416506dfadf60c14fc623ff01ef99b87564a78d0a29c5d17143c97609 guile-3.0.7.tar.gz f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 guile-3.0.7.tar.xz f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz @@ -42,12 +45,11 @@ f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800 nss-3.78.tar.g 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826 perl-5.10.1.tar.bz2 -57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz 1d179b41283f12ad83f9758430f6ddc49bdf20db5c396aeae7e51ebb4e4afd29 perl_5.32.1.orig-regen-configure.tar.gz +57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 pkg-config-0.29.2.tar.gz 63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28 tar-1.34.tar.xz 988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa texinfo-6.7.tar.xz -0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a 0.59.1.tar.gz f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad which-2.21.tar.gz 166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490 xz-5.0.5.tar.bz2 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz diff --git a/sysc/grep-3.7/grep-3.7.sh b/sysc/grep-3.7/grep-3.7.sh new file mode 100755 index 0000000..e70ca36 --- /dev/null +++ b/sysc/grep-3.7/grep-3.7.sh @@ -0,0 +1,23 @@ +# SPDX-FileCopyrightText: 2022 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +urls="https://mirrors.kernel.org/gnu/grep/grep-3.7.tar.xz + http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-8f4538a5.tar.gz" + +src_prepare() { + rm configure + find . -name 'Makefile.in' -delete + + ../../import-gnulib.sh + + autoreconf-2.71 -fi +} + +src_configure() { + LDFLAGS="-static" ./configure --prefix="${PREFIX}" +} + +src_install() { + default +} diff --git a/sysc/grep-3.7/import-gnulib.sh b/sysc/grep-3.7/import-gnulib.sh new file mode 100755 index 0000000..2dc6e44 --- /dev/null +++ b/sysc/grep-3.7/import-gnulib.sh @@ -0,0 +1,100 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: 2022 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +../gnulib-8f4538a5/gnulib-tool --import --local-dir=gl \ + --lib=libgreputils \ + --source-base=lib \ + --m4-base=m4 \ + --doc-base=doc \ + --tests-base=gnulib-tests \ + --aux-dir=build-aux \ + --with-tests \ + --makefile-name=gnulib.mk \ + --no-conditional-dependencies \ + --no-libtool \ + --macro-prefix=gl \ + --avoid=lock-tests \ + --avoid=mbrtowc-tests \ + --avoid=update-copyright-tests \ + alloca \ + announce-gen \ + argmatch \ + c-ctype \ + c-stack \ + c-strcase \ + closeout \ + configmake \ + dfa \ + dirname-lgpl \ + do-release-commit-and-tag \ + error \ + exclude \ + fcntl-h \ + fdl \ + fnmatch \ + fstatat \ + fts \ + getopt-gnu \ + getpagesize \ + getprogname \ + gettext-h \ + git-version-gen \ + gitlog-to-changelog \ + gnu-web-doc-update \ + gnupload \ + hash \ + ignore-value \ + intprops \ + inttypes \ + isatty \ + isblank \ + iswctype \ + largefile \ + locale \ + lseek \ + maintainer-makefile \ + malloc-gnu \ + manywarnings \ + mbrlen \ + mbrtowc \ + memchr \ + memchr2 \ + mempcpy \ + minmax \ + obstack \ + openat-safer \ + perl \ + propername \ + rawmemchr \ + readme-release \ + realloc-gnu \ + regex \ + safe-read \ + same-inode \ + ssize_t \ + stddef \ + stdlib \ + stpcpy \ + strerror \ + string \ + strstr \ + strtoull \ + strtoumax \ + sys_stat \ + unistd \ + unlocked-io \ + update-copyright \ + useless-if-before-free \ + verify \ + version-etc-fsf \ + wchar \ + wcrtomb \ + wctob \ + wctype-h \ + windows-stat-inodes \ + xalloc \ + xbinary-io \ + xstrtoimax diff --git a/sysc/run2.sh b/sysc/run2.sh index 329d4f3..1d630df 100755 --- a/sysc/run2.sh +++ b/sysc/run2.sh @@ -100,6 +100,8 @@ build guile-3.0.7 build which-2.21 +build grep-3.7 + if [ "$FORCE_TIMESTAMPS" = True ] ; then echo 'Forcing all files timestamps to be 0 unix time.' canonicalise_all_files_timestamp