[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 17/30] configure: remove pkg-config functions
From: |
Paolo Bonzini |
Subject: |
[PATCH 17/30] configure: remove pkg-config functions |
Date: |
Fri, 9 Dec 2022 12:23:56 +0100 |
All uses of pkg-config have been moved to Meson.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 19 +++----------------
docs/devel/build-system.rst | 4 ----
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/configure b/configure
index fb28dd3963bd..9c336203d8d9 100755
--- a/configure
+++ b/configure
@@ -365,11 +365,7 @@ smbd="$SMBD"
strip="${STRIP-${cross_prefix}strip}"
widl="${WIDL-${cross_prefix}widl}"
windres="${WINDRES-${cross_prefix}windres}"
-pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
-query_pkg_config() {
- "${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@"
-}
-pkg_config=query_pkg_config
+pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
sdl2_config="${SDL2_CONFIG-${cross_prefix}sdl2-config}"
# default flags for all hosts
@@ -745,9 +741,7 @@ for opt do
;;
--without-default-features) # processed above
;;
- --static)
- static="yes"
- QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
+ --static) static="yes"
;;
--bindir=*) bindir="$optarg"
;;
@@ -1419,13 +1413,6 @@ EOF
fi
fi
-##########################################
-# pkg-config probe
-
-if ! has "$pkg_config_exe"; then
- error_exit "pkg-config binary '$pkg_config_exe' not found"
-fi
-
##########################################
# fdt probe
@@ -2423,7 +2410,7 @@ if test "$skip_meson" = no; then
test -n "$objcc" && echo "objc = [$(meson_quote $objcc $CPU_CFLAGS)]" >>
$cross
echo "ar = [$(meson_quote $ar)]" >> $cross
echo "nm = [$(meson_quote $nm)]" >> $cross
- echo "pkgconfig = [$(meson_quote $pkg_config_exe)]" >> $cross
+ echo "pkgconfig = [$(meson_quote $pkg_config)]" >> $cross
echo "ranlib = [$(meson_quote $ranlib)]" >> $cross
if has $sdl2_config; then
echo "sdl2-config = [$(meson_quote $sdl2_config)]" >> $cross
diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
index 9db18aff159e..66cfe7b8bdc8 100644
--- a/docs/devel/build-system.rst
+++ b/docs/devel/build-system.rst
@@ -103,10 +103,6 @@ developers in checking for system features:
Print $MESSAGE to stderr, followed by $MORE... and then exit from the
configure script with non-zero status
-``query_pkg_config $ARGS...``
- Run pkg-config passing it $ARGS. If QEMU is doing a static build,
- then --static will be automatically added to $ARGS
-
Stage 2: Meson
==============
--
2.38.1
- Re: [PATCH 21/30] build: move sanitizer tests to meson, (continued)
- [PATCH 24/30] build: move stack protector flag selection to meson, Paolo Bonzini, 2022/12/09
- [PATCH 30/30] meson: always log qemu-iotests verbosely, Paolo Bonzini, 2022/12/09
- [PATCH 29/30] configure: do not rerun the tests with -Werror, Paolo Bonzini, 2022/12/09
- [PATCH 17/30] configure: remove pkg-config functions,
Paolo Bonzini <=
- [PATCH 25/30] build: move warning flag selection to meson, Paolo Bonzini, 2022/12/09
- [PATCH 27/30] build: move compiler version check to meson, Paolo Bonzini, 2022/12/09
[PATCH 20/30] meson: prepare move of QEMU_CFLAGS to meson, Paolo Bonzini, 2022/12/09