From 6c8d11e8e5b3457286fcda75b6516e93f1f12f17 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 10 Apr 2024 13:13:19 -0400
Subject: build: Run pkg-config with all packages at once

---
 config/pkg.sh | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'config/pkg.sh')

diff --git a/config/pkg.sh b/config/pkg.sh
index 6335b4b..2ca533e 100755
--- a/config/pkg.sh
+++ b/config/pkg.sh
@@ -8,37 +8,19 @@
 set -eu
 
 NAME="${1^^}"
-declare -n XUSE="XUSE_$NAME"
+declare -n XUSE="USE_$NAME"
 
-if [ "$XUSE" ]; then
+if [ "${XUSE:-}" ]; then
     USE="$XUSE"
-elif [[ "$NOLIBS" == *y* ]]; then
-    USE=n
 elif config/pkgconf.sh "$1"; then
     USE=y
 else
     USE=n
 fi
 
-printf '%s := %s\n' "USE_$NAME" "$USE"
-
 if [ "$USE" = y ]; then
+    printf 'PKGS += %s\n' "$1"
     printf 'CPPFLAGS += -DBFS_USE_%s=1\n' "$NAME"
-
-    CFLAGS=$(config/pkgconf.sh --cflags "$1")
-    if [ "$CFLAGS" ]; then
-        printf 'CFLAGS += %s\n' "$CFLAGS"
-    fi
-
-    LDFLAGS=$(config/pkgconf.sh --ldflags "$1")
-    if [ "$LDFLAGS" ]; then
-        printf 'LDFLAGS += %s\n' "$LDFLAGS"
-    fi
-
-    LDLIBS=$(config/pkgconf.sh --ldlibs "$1")
-    if [ "$LDLIBS" ]; then
-        printf 'LDLIBS += %s\n' "$LDLIBS"
-    fi
 else
     printf 'CPPFLAGS += -DBFS_USE_%s=0\n' "$NAME"
 fi
-- 
cgit v1.2.3