On Fri, Dec 9, 2022 at 3:39 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
>
> All uses of pkg-config have been moved to Meson.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@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
>
>
--
Marc-André Lureau
