configure: Enable test and libs for zstd
Add it to several build systems to make testing good. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela
parent
7ec2c2b3c1
commit
3a67848134
@ -21,6 +21,7 @@ build-system2:
|
||||
script:
|
||||
- apt-get install -y -qq libsdl2-dev libgcrypt-dev libbrlapi-dev libaio-dev
|
||||
libfdt-dev liblzo2-dev librdmacm-dev libibverbs-dev libibumad-dev
|
||||
libzstd-dev
|
||||
- mkdir build
|
||||
- cd build
|
||||
- ../configure --enable-werror --target-list="tricore-softmmu unicore32-softmmu
|
||||
|
||||
@ -49,6 +49,7 @@ addons:
|
||||
- libusb-1.0-0-dev
|
||||
- libvdeplug-dev
|
||||
- libvte-2.91-dev
|
||||
- libzstd-dev
|
||||
- sparse
|
||||
- uuid-dev
|
||||
- gcovr
|
||||
|
||||
30
configure
vendored
30
configure
vendored
@ -449,6 +449,7 @@ lzo=""
|
||||
snappy=""
|
||||
bzip2=""
|
||||
lzfse=""
|
||||
zstd=""
|
||||
guest_agent=""
|
||||
guest_agent_with_vss="no"
|
||||
guest_agent_ntddscsi="no"
|
||||
@ -1371,6 +1372,10 @@ for opt do
|
||||
;;
|
||||
--disable-lzfse) lzfse="no"
|
||||
;;
|
||||
--disable-zstd) zstd="no"
|
||||
;;
|
||||
--enable-zstd) zstd="yes"
|
||||
;;
|
||||
--enable-guest-agent) guest_agent="yes"
|
||||
;;
|
||||
--disable-guest-agent) guest_agent="no"
|
||||
@ -1829,6 +1834,8 @@ disabled with --disable-FEATURE, default is enabled if available:
|
||||
(for reading bzip2-compressed dmg images)
|
||||
lzfse support of lzfse compression library
|
||||
(for reading lzfse-compressed dmg images)
|
||||
zstd support for zstd compression library
|
||||
(for migration compression)
|
||||
seccomp seccomp support
|
||||
coroutine-pool coroutine freelist (better performance)
|
||||
glusterfs GlusterFS backend
|
||||
@ -2453,6 +2460,24 @@ EOF
|
||||
fi
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# zstd check
|
||||
|
||||
if test "$zstd" != "no" ; then
|
||||
if $pkg_config --exist libzstd ; then
|
||||
zstd_cflags="$($pkg_config --cflags libzstd)"
|
||||
zstd_libs="$($pkg_config --libs libzstd)"
|
||||
LIBS="$zstd_libs $LIBS"
|
||||
QEMU_CFLAGS="$QEMU_CFLAGS $zstd_cflags"
|
||||
zstd="yes"
|
||||
else
|
||||
if test "$zstd" = "yes" ; then
|
||||
feature_not_found "libzstd" "Install libzstd devel"
|
||||
fi
|
||||
zstd="no"
|
||||
fi
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# libseccomp check
|
||||
|
||||
@ -6668,6 +6693,7 @@ echo "lzo support $lzo"
|
||||
echo "snappy support $snappy"
|
||||
echo "bzip2 support $bzip2"
|
||||
echo "lzfse support $lzfse"
|
||||
echo "zstd support $zstd"
|
||||
echo "NUMA host support $numa"
|
||||
echo "libxml2 $libxml2"
|
||||
echo "tcmalloc support $tcmalloc"
|
||||
@ -7242,6 +7268,10 @@ if test "$lzfse" = "yes" ; then
|
||||
echo "LZFSE_LIBS=-llzfse" >> $config_host_mak
|
||||
fi
|
||||
|
||||
if test "$zstd" = "yes" ; then
|
||||
echo "CONFIG_ZSTD=y" >> $config_host_mak
|
||||
fi
|
||||
|
||||
if test "$libiscsi" = "yes" ; then
|
||||
echo "CONFIG_LIBISCSI=m" >> $config_host_mak
|
||||
echo "LIBISCSI_CFLAGS=$libiscsi_cflags" >> $config_host_mak
|
||||
|
||||
@ -33,6 +33,7 @@ ENV PACKAGES \
|
||||
tar \
|
||||
vte-devel \
|
||||
xen-devel \
|
||||
zlib-devel
|
||||
zlib-devel \
|
||||
libzstd-devel
|
||||
RUN yum install -y $PACKAGES
|
||||
RUN rpm -q $PACKAGES | sort > /packages.txt
|
||||
|
||||
@ -7,7 +7,8 @@ ENV PACKAGES \
|
||||
gnutls-devel.i686 \
|
||||
nettle-devel.i686 \
|
||||
pixman-devel.i686 \
|
||||
zlib-devel.i686
|
||||
zlib-devel.i686 \
|
||||
libzstd-devel.i686
|
||||
|
||||
RUN dnf install -y $PACKAGES
|
||||
RUN rpm -q $PACKAGES | sort > /packages.txt
|
||||
|
||||
@ -92,7 +92,8 @@ ENV PACKAGES \
|
||||
vte291-devel \
|
||||
which \
|
||||
xen-devel \
|
||||
zlib-devel
|
||||
zlib-devel \
|
||||
libzstd-devel
|
||||
ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
|
||||
|
||||
RUN dnf install -y $PACKAGES
|
||||
|
||||
@ -58,6 +58,7 @@ ENV PACKAGES flex bison \
|
||||
libvdeplug-dev \
|
||||
libvte-2.91-dev \
|
||||
libxen-dev \
|
||||
libzstd-dev \
|
||||
make \
|
||||
python3-yaml \
|
||||
python3-sphinx \
|
||||
|
||||
@ -44,6 +44,7 @@ ENV PACKAGES flex bison \
|
||||
libvdeplug-dev \
|
||||
libvte-2.91-dev \
|
||||
libxen-dev \
|
||||
libzstd-dev \
|
||||
make \
|
||||
python3-yaml \
|
||||
python3-sphinx \
|
||||
|
||||
@ -53,7 +53,10 @@ class FedoraVM(basevm.BaseVM):
|
||||
# libs: audio
|
||||
'"pkgconfig(libpulse)"',
|
||||
'"pkgconfig(alsa)"',
|
||||
]
|
||||
|
||||
# libs: migration
|
||||
'"pkgconfig(libzstd)"',
|
||||
]
|
||||
|
||||
BUILD_SCRIPT = """
|
||||
set -e;
|
||||
|
||||
@ -55,6 +55,9 @@ class FreeBSDVM(basevm.BaseVM):
|
||||
# libs: opengl
|
||||
"libepoxy",
|
||||
"mesa-libs",
|
||||
|
||||
# libs: migration
|
||||
"zstd",
|
||||
]
|
||||
|
||||
BUILD_SCRIPT = """
|
||||
|
||||
@ -49,6 +49,9 @@ class NetBSDVM(basevm.BaseVM):
|
||||
"SDL2",
|
||||
"gtk3+",
|
||||
"libxkbcommon",
|
||||
|
||||
# libs: migration
|
||||
"zstd",
|
||||
]
|
||||
|
||||
BUILD_SCRIPT = """
|
||||
|
||||
@ -51,6 +51,9 @@ class OpenBSDVM(basevm.BaseVM):
|
||||
"sdl2",
|
||||
"gtk+3",
|
||||
"libxkbcommon",
|
||||
|
||||
# libs: migration
|
||||
"zstd",
|
||||
]
|
||||
|
||||
BUILD_SCRIPT = """
|
||||
|
||||
Loading…
Reference in New Issue
Block a user