diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-10-12 13:03:18 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-05-18 08:53:52 +0200 |
| commit | 877c5567050eff2c63267d76f0c0c3c38cebe048 (patch) | |
| tree | b31f2efde5b3d13db8cf4b7e5d8f8aef8a413ec8 | |
| parent | fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 (diff) | |
| download | focaccia-qemu-877c5567050eff2c63267d76f0c0c3c38cebe048.tar.gz focaccia-qemu-877c5567050eff2c63267d76f0c0c3c38cebe048.zip | |
configure: remove pkg-config functions
All uses of pkg-config have been moved to Meson. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | configure | 21 | ||||
| -rw-r--r-- | docs/devel/build-system.rst | 4 |
2 files changed, 4 insertions, 21 deletions
diff --git a/configure b/configure index b7cae08c43..115cc325db 100755 --- a/configure +++ b/configure @@ -389,11 +389,7 @@ strip="${STRIP-${cross_prefix}strip}" widl="${WIDL-${cross_prefix}widl}" windres="${WINDRES-${cross_prefix}windres}" windmc="${WINDMC-${cross_prefix}windmc}" -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 @@ -791,9 +787,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" ;; @@ -1502,13 +1496,6 @@ EOF fi ########################################## -# pkg-config probe - -if ! has "$pkg_config_exe"; then - error_exit "pkg-config binary '$pkg_config_exe' not found" -fi - -########################################## # fdt probe case "$fdt" in @@ -2364,7 +2351,7 @@ echo "PYTHON=$python" >> $config_host_mak echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak echo "NINJA=$ninja" >> $config_host_mak -echo "PKG_CONFIG=${pkg_config_exe}" >> $config_host_mak +echo "PKG_CONFIG=${pkg_config}" >> $config_host_mak echo "CC=$cc" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_OBJCFLAGS=$QEMU_OBJCFLAGS" >> $config_host_mak @@ -2514,7 +2501,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 9db18aff15..66cfe7b8bd 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 ============== |