From 9f3f65f14617119413d6ca0e42426c242b79cf38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Fri, 16 Sep 2022 22:40:00 +0100
Subject: [PATCH] Add which 2.21.

---
 parts.rst                     |  7 +++++++
 sysa/SHA256SUMS.pkgs          |  1 +
 sysc.py                       |  3 +++
 sysc/SHA256SUMS.sources       |  1 +
 sysc/run2.sh                  |  2 ++
 sysc/which-2.21/which-2.21.sh | 22 ++++++++++++++++++++++
 6 files changed, 36 insertions(+)
 create mode 100755 sysc/which-2.21/which-2.21.sh

diff --git a/parts.rst b/parts.rst
index 1ee03c8..7a9506d 100644
--- a/parts.rst
+++ b/parts.rst
@@ -836,3 +836,10 @@ of the programming language Scheme.
 
 We use ``guile-psyntax-bootstrapping`` project to bootstrap Guile's ``psyntax.pp``
 without relying on pre-expanded code.
+
+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.
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 900254f..b344027 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -96,6 +96,7 @@ db57c6ef39965f0562d2aefe3c06571df50ba1265446d97f2714d80518862cef  tcc-0.9.27_1.t
 e2014b844b1a79cda9142a38af0404efd242ae02f77aa286c968e4ad6ad87265  tcc-0.9.27_2.tar.bz2
 96dc08f4d01eddc04af107ffd313617af3fc455af38a82b850c4aca08cbd7e84  texinfo-6.7_0.x86.xbps
 bf4a6be34cda165e4c206e852ccc09387f5ae8ea7db6de2db01297cabfa1a486  util-linux-2.19.1_0.tar.bz2
+0e7d6e99a30f42a55a81ffd43ccf686d0c52d1b125965dfbdbdd18cceccb0530  which-2.21_0.x86.xbps
 3f044d2aaa838c9df153d662f8e259c2393774d3d3a5e71e26b5d867dbb08107  xbps-0.59.1_0.tar.bz2
 e900a8b70f49bfcbb7a48bd27e2de67c30454d693b6f35dcdfadd35570e98e69  xz-5.0.5_0.tar.bz2
 bb1e34d0392fddf9718e025344af575c1c534fbc61a1e4476e0c7ae2614f57ca  zlib-1.2.12_0.tar.bz2
diff --git a/sysc.py b/sysc.py
index 009be5d..7a6b6ec 100755
--- a/sysc.py
+++ b/sysc.py
@@ -212,3 +212,6 @@ class SysC(SysGeneral):
         self.get_file(["https://mirrors.kernel.org/gnu/guile/guile-3.0.7.tar.xz",
                        "https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-901694b9.tar.gz",
                        "https://github.com/schierlm/guile-psyntax-bootstrapping/archive/refs/tags/guile-3.0.7.tar.gz"])
+
+        # which 2.21
+        self.get_file("https://carlowood.github.io/which/which-2.21.tar.gz")
diff --git a/sysc/SHA256SUMS.sources b/sysc/SHA256SUMS.sources
index 105e202..7e84260 100644
--- a/sysc/SHA256SUMS.sources
+++ b/sysc/SHA256SUMS.sources
@@ -48,5 +48,6 @@ ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd  patch-2.7.6.ta
 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/run2.sh b/sysc/run2.sh
index 12da139..329d4f3 100755
--- a/sysc/run2.sh
+++ b/sysc/run2.sh
@@ -98,6 +98,8 @@ build gc-8.0.4
 
 build guile-3.0.7
 
+build which-2.21
+
 if [ "$FORCE_TIMESTAMPS" = True ] ; then
     echo 'Forcing all files timestamps to be 0 unix time.'
     canonicalise_all_files_timestamp
diff --git a/sysc/which-2.21/which-2.21.sh b/sysc/which-2.21/which-2.21.sh
new file mode 100755
index 0000000..e5cdeda
--- /dev/null
+++ b/sysc/which-2.21/which-2.21.sh
@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+urls="https://carlowood.github.io/which/which-2.21.tar.gz"
+
+src_prepare() {
+    rm configure Makefile.in aclocal.m4 which.1
+    touch ChangeLog which.1
+    sed -i '/@ACLOCAL_CWFLAGS@/d' Makefile.am
+    autoreconf-2.69 -fi
+}
+
+src_configure() {
+    CFLAGS="-static" ./configure --prefix="${PREFIX}"
+}
+
+src_install() {
+    default
+
+    rm "${DESTDIR}/${PREFIX}/share/man/man1/which.1"
+}