From c9384a3aee07a0dd2aa5ddd0625e99829fca9ae6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 23 Oct 2023 10:36:27 +0100 Subject: [PATCH] Depend on pkgconf in preference to pkg-config --- debian/control | 3 ++- debian/tests/build | 4 ++-- debian/tests/control | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index a3b32b17..0a525020 100644 --- a/debian/control +++ b/debian/control @@ -41,6 +41,7 @@ Build-Depends: libsoup-3.0-dev (>= 3.0.0), libsystemd-dev, libtool, + pkgconf, procps, python3 , python3-yaml , @@ -100,7 +101,7 @@ Depends: gir1.2-ostree-1.0 (= ${binary:Version}), libglib2.0-dev (>= 2.66.0), libostree-1-1 (= ${binary:Version}), - pkg-config, + pkgconf, ${misc:Depends}, Suggests: libostree-doc, diff --git a/debian/tests/build b/debian/tests/build index 1a40303e..f34c7c7d 100755 --- a/debian/tests/build +++ b/debian/tests/build @@ -22,9 +22,9 @@ int main (void) } EOF -# Deliberately word-splitting, that's how pkg-config works: +# Deliberately word-splitting, that's how pkgconf works: # shellcheck disable=SC2046 -"${CROSS_COMPILE}gcc" -o trivial trivial.c $("${CROSS_COMPILE}pkg-config" --cflags --libs ostree-1 gobject-2.0) +"${CROSS_COMPILE}gcc" -o trivial trivial.c $("${CROSS_COMPILE}pkgconf" --cflags --libs ostree-1 gobject-2.0) test -x trivial ./trivial echo "OK" diff --git a/debian/tests/control b/debian/tests/control index f619ebc9..b4286132 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -12,4 +12,4 @@ Depends: gnome-desktop-testing, ostree-tests Tests: build Restrictions: superficial -Depends: build-essential, libostree-dev, pkg-config +Depends: build-essential, libostree-dev, pkgconf -- 2.30.2