From a2cfd448b0b0dd0bf745b3728195b9c43d451e0f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 3 Apr 2023 14:12:03 -0600
Subject: [PATCH] Convert pkg-config to toml recipe format
---
recipes/pkg-config/recipe.sh | 33 ---------------------------------
recipes/pkg-config/recipe.toml | 14 ++++++++++++++
2 files changed, 14 insertions(+), 33 deletions(-)
delete mode 100755 recipes/pkg-config/recipe.sh
create mode 100755 recipes/pkg-config/recipe.toml
diff --git a/recipes/pkg-config/recipe.sh b/recipes/pkg-config/recipe.sh
deleted file mode 100755
index 50e549aab..000000000
--- a/recipes/pkg-config/recipe.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-VERSION="0.29.2"
-TAR="https://pkg-config.freedesktop.org/releases/pkg-config-${VERSION}.tar.gz"
-BUILD_DEPENDS=(gettext glib libiconv pcre)
-
-function recipe_version {
- echo "$VERSION"
- skip=1
-}
-
-function recipe_build {
- wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
- export LDFLAGS="--static"
- ./configure \
- --build="${BUILD}" \
- --host="${HOST}" \
- --prefix="" \
- --disable-shared \
- --enable-static
- "$REDOX_MAKE" -j"$($NPROC)"
- skip=1
-}
-
-function recipe_clean {
- "$REDOX_MAKE" clean
- skip=1
-}
-
-function recipe_stage {
- export DESTDIR="$(realpath $1)"
- "$REDOX_MAKE" install
- rm -f "${DESTDIR}/lib/"*.la
- skip=1
-}
diff --git a/recipes/pkg-config/recipe.toml b/recipes/pkg-config/recipe.toml
new file mode 100755
index 000000000..a94241461
--- /dev/null
+++ b/recipes/pkg-config/recipe.toml
@@ -0,0 +1,14 @@
+[source]
+tar = "https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz"
+script = """
+wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
+"""
+
+[build]
+dependencies = [
+ "gettext",
+ "glib",
+ "libiconv",
+ "pcre",
+]
+template = "configure"
--
GitLab