From 4cf20d19ae276e943ea8557c82e767f335303c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Tue, 29 Jun 2021 22:20:15 +0100
Subject: [PATCH] pkg-config-0.29.2

---
 SHA256SUMS.sources                          |  3 ++-
 parts.rst                                   |  5 ++++
 sysa.py                                     |  3 +++
 sysa/make-4.2.1/patches/pkg-config.patch    | 28 ---------------------
 sysa/pkg-config-0.29.2/checksums            |  1 +
 sysa/pkg-config-0.29.2/pkg-config-0.29.2.sh | 16 ++++++++++++
 sysa/run2.sh                                |  2 ++
 7 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 sysa/make-4.2.1/patches/pkg-config.patch
 create mode 100644 sysa/pkg-config-0.29.2/checksums
 create mode 100755 sysa/pkg-config-0.29.2/pkg-config-0.29.2.sh

diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index fd4b884..1ef4fdd 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -41,7 +41,7 @@ e9bf58c761a4f988311aef6b41f12fd5c7e51d09477468fb73826aecc1be32e7  gcc-4.0.4.tar.
 d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192  gettext-0.21.tar.xz
 fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2  gmp-6.2.1.tar.xz
 df807e694deea2dcba0c43af318394f3e3fcd52658c3b71b61dad0ce0c0cfb77  gnulib-30820c.tar.gz
-1fb91693eeca4b816f73fb8fbcaadbf0366f5c1e18e3dd1f2128da5310de374d  gnulib-52a06cb3.tar.gz
+009989b81c0bebc5f6550636ed653fbcb237dafc2af5c706f3522087ca571e4d  gnulib-52a06cb3.tar.gz
 8cced51f89a950472473856f86e88f5daf97a2347756125ccdc8ee907deec570  gnulib-672663a.tar.gz
 2d911c2f2ed97b347d6d360b742abdc98aa626d4f8f847ee682c7cde12e90871  gnulib-7daa86f.tar.gz
 0cfbf866bc39c31f25fa0e56af1e56c5e5c92fc1e5d51242ebafef7ea211f3d5  gnulib-8e128e.tar.gz
@@ -76,6 +76,7 @@ ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd  patch-2.7.6.ta
 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309  perl-5.32.1.tar.xz
 a5e66f6ebf701b0567f569f57cae82abf5ce57af70a2b45ae71323b61f49134e  perl-5.6.2.tar.gz
 3ec396d97debb6c1a112c1c6ff58b03a55866b75cd4fe06b74295ac9c5fc5ff2  perl-5f2dc80.tar.bz2
+6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591  pkg-config-0.29.2.tar.gz
 c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600  sed-4.0.9.tar.gz
 c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a  tar-1.12.tar.gz
 63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28  tar-1.34.tar.xz
diff --git a/parts.rst b/parts.rst
index 7aa6ce0..0ece320 100644
--- a/parts.rst
+++ b/parts.rst
@@ -581,6 +581,11 @@ We build the latest available coreutils 8.32 which adds needed options to make
 results of build metadata reproducible. For example, timestamps are changed with
 ``touch --no-dereference``.
 
+pkg-config 0.29.2
+=================
+
+pkg-config is a helper tool that helps to insert compile and link time flags.
+
 make 4.2.1
 ==========
 
diff --git a/sysa.py b/sysa.py
index fe6f11f..ec6ff27 100755
--- a/sysa.py
+++ b/sysa.py
@@ -392,6 +392,9 @@ class SysA:
         self.get_file(["https://git.savannah.gnu.org/cgit/coreutils.git/snapshot/coreutils-8.32.tar.gz",
                        "https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-d279bc.tar.gz"])
 
+        # pkg-config 0.29.2
+        self.get_file("https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz")
+
         # make 4.2.1
         self.get_file("https://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz")
 
diff --git a/sysa/make-4.2.1/patches/pkg-config.patch b/sysa/make-4.2.1/patches/pkg-config.patch
deleted file mode 100644
index a30392e..0000000
--- a/sysa/make-4.2.1/patches/pkg-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
-
-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/pkg-config-0.29.2/checksums b/sysa/pkg-config-0.29.2/checksums
new file mode 100644
index 0000000..18f315b
--- /dev/null
+++ b/sysa/pkg-config-0.29.2/checksums
@@ -0,0 +1 @@
+95bfa9867c273ae5e5ff8126b377952907b33ff00dd1cf0059aa587c1dfc2ec5  /image/bin/pkg-config
diff --git a/sysa/pkg-config-0.29.2/pkg-config-0.29.2.sh b/sysa/pkg-config-0.29.2/pkg-config-0.29.2.sh
new file mode 100755
index 0000000..1688004
--- /dev/null
+++ b/sysa/pkg-config-0.29.2/pkg-config-0.29.2.sh
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    autoreconf -fi
+}
+
+src_configure() {
+    # We use internal glib because standalone glib library depends on
+    # pkg-config and other software (python/meson) that we do not have.
+    ./configure \
+        --prefix="${PREFIX}" \
+        --build=i386-unknown-linux-gnu \
+        --with-internal-glib
+}
diff --git a/sysa/run2.sh b/sysa/run2.sh
index 57515b2..abcfdd6 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -26,6 +26,8 @@ build tar-1.34
 
 build coreutils-8.32
 
+build pkg-config-0.29.2
+
 build make-4.2.1
 
 build gmp-6.2.1