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>
This commit is contained in:
parent
fc9a809e0d
commit
877c556705
|
@ -389,11 +389,7 @@ strip="${STRIP-${cross_prefix}strip}"
|
||||||
widl="${WIDL-${cross_prefix}widl}"
|
widl="${WIDL-${cross_prefix}widl}"
|
||||||
windres="${WINDRES-${cross_prefix}windres}"
|
windres="${WINDRES-${cross_prefix}windres}"
|
||||||
windmc="${WINDMC-${cross_prefix}windmc}"
|
windmc="${WINDMC-${cross_prefix}windmc}"
|
||||||
pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
|
pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
|
||||||
query_pkg_config() {
|
|
||||||
"${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@"
|
|
||||||
}
|
|
||||||
pkg_config=query_pkg_config
|
|
||||||
sdl2_config="${SDL2_CONFIG-${cross_prefix}sdl2-config}"
|
sdl2_config="${SDL2_CONFIG-${cross_prefix}sdl2-config}"
|
||||||
|
|
||||||
# default flags for all hosts
|
# default flags for all hosts
|
||||||
|
@ -791,9 +787,7 @@ for opt do
|
||||||
;;
|
;;
|
||||||
--without-default-features) # processed above
|
--without-default-features) # processed above
|
||||||
;;
|
;;
|
||||||
--static)
|
--static) static="yes"
|
||||||
static="yes"
|
|
||||||
QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
|
|
||||||
;;
|
;;
|
||||||
--bindir=*) bindir="$optarg"
|
--bindir=*) bindir="$optarg"
|
||||||
;;
|
;;
|
||||||
|
@ -1501,13 +1495,6 @@ EOF
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
##########################################
|
|
||||||
# pkg-config probe
|
|
||||||
|
|
||||||
if ! has "$pkg_config_exe"; then
|
|
||||||
error_exit "pkg-config binary '$pkg_config_exe' not found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
# fdt probe
|
# fdt probe
|
||||||
|
|
||||||
|
@ -2364,7 +2351,7 @@ echo "PYTHON=$python" >> $config_host_mak
|
||||||
echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
|
echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
|
||||||
echo "MESON=$meson" >> $config_host_mak
|
echo "MESON=$meson" >> $config_host_mak
|
||||||
echo "NINJA=$ninja" >> $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 "CC=$cc" >> $config_host_mak
|
||||||
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
|
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
|
||||||
echo "QEMU_OBJCFLAGS=$QEMU_OBJCFLAGS" >> $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
|
test -n "$objcc" && echo "objc = [$(meson_quote $objcc $CPU_CFLAGS)]" >> $cross
|
||||||
echo "ar = [$(meson_quote $ar)]" >> $cross
|
echo "ar = [$(meson_quote $ar)]" >> $cross
|
||||||
echo "nm = [$(meson_quote $nm)]" >> $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
|
echo "ranlib = [$(meson_quote $ranlib)]" >> $cross
|
||||||
if has $sdl2_config; then
|
if has $sdl2_config; then
|
||||||
echo "sdl2-config = [$(meson_quote $sdl2_config)]" >> $cross
|
echo "sdl2-config = [$(meson_quote $sdl2_config)]" >> $cross
|
||||||
|
|
|
@ -103,10 +103,6 @@ developers in checking for system features:
|
||||||
Print $MESSAGE to stderr, followed by $MORE... and then exit from the
|
Print $MESSAGE to stderr, followed by $MORE... and then exit from the
|
||||||
configure script with non-zero status
|
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
|
Stage 2: Meson
|
||||||
==============
|
==============
|
||||||
|
|
Loading…
Reference in New Issue