Re: [PATCH] configure: Improve zstd test

[Alex Bennée]

Juan Quintela <address@hidden> writes:

> There were one error on the test (missing an s for --exists).
> But we really need a recent zstd (0.8.1).
> That version was released in 2016, so it is newer that some of our travis
> images.  Just check for the version that we need.
>
> Signed-off-by: Juan Quintela <address@hidden>
> Reported-by: Richard Henderson <address@hidden>
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 7b373bc0bb..1bf48df1ef 100755
> --- a/configure
> +++ b/configure
> @@ -2464,7 +2464,8 @@ fi
>  # zstd check
>  
>  if test "$zstd" != "no" ; then
> -    if $pkg_config --exist libzstd ; then
> +    libzstd_minver="0.8.1"
> +    if $pkg_config --atleast-version=$libzstd_minver libzstd ; then
>          zstd_cflags="$($pkg_config --cflags libzstd)"
>          zstd_libs="$($pkg_config --libs libzstd)"
>          LIBS="$zstd_libs $LIBS"

Hmm still breaks with:

   make docker-test-build@ubuntu J=9 V=1

With:

  FY_SOURCE=2 -g   -c -o monitor/qmp.o /tmp/qemu-test/src/monitor/qmp.c
  /tmp/qemu-test/src/migration/multifd-zstd.c: In function 'zstd_send_prepare':
  /tmp/qemu-test/src/migration/multifd-zstd.c:125:9: error: unknown type name 
'ZSTD_EndDirective'; did you mean 'ZSTD_DDict'?
           ZSTD_EndDirective flush = ZSTD_e_continue;
           ^~~~~~~~~~~~~~~~~
           ZSTD_DDict
  /tmp/qemu-test/src/migration/multifd-zstd.c:125:35: error: 'ZSTD_e_continue' 
undeclared (first use in this function); did you mean 'g_timer_continue'?
           ZSTD_EndDirective flush = ZSTD_e_continue;
                                     ^~~~~~~~~~~~~~~
                                     g_timer_continue
  /tmp/qemu-test/src/migration/multifd-zstd.c:125:35: note: each undeclared 
identifier is reported only once for each function it appears in
  /tmp/qemu-test/src/migration/multifd-zstd.c:128:21: error: 'ZSTD_e_flush' 
undeclared (first use in this function); did you mean 'ZSTD_DCtx_s'?
               flush = ZSTD_e_flush;
                       ^~~~~~~~~~~~
                       ZSTD_DCtx_s
  /tmp/qemu-test/src/migration/multifd-zstd.c:143:19: error: implicit 
declaration of function 'ZSTD_compressStream2'; did you mean 
'ZSTD_compressStream'? [-Werror=implicit-fun
  ction-declaration]
               ret = ZSTD_compressStream2(z->zcs, &z->out, &z->in, flush);
                     ^~~~~~~~~~~~~~~~~~~~
                     ZSTD_compressStream
  /tmp/qemu-test/src/migration/multifd-zstd.c:143:19: error: nested extern 
declaration of 'ZSTD_compressStream2' [-Werror=nested-externs]
  cc1: all warnings being treated as errors
  make: *** [/tmp/qemu-test/src/rules.mak:69: migration/multifd-zstd.o] Error 1
  make: *** Waiting for unfinished jobs....
  rm tests/qemu-iotests/socket_scm_helper.o

Running manually you get:

  14:48:20 [alex@zen:~/l/q/b/all] review/misc-bits|… 1 + docker run --rm -it 
qemu:ubuntu pkg-config --exists libzstd
  14:48:24 [alex@zen:~/l/q/b/all] review/misc-bits|… + echo $status
  0
  14:48:28 [alex@zen:~/l/q/b/all] review/misc-bits|… + docker run --rm -it 
qemu:ubuntu pkg-config --atleast-version="0.8.1" libzstd
  14:48:52 [alex@zen:~/l/q/b/all] review/misc-bits|… + echo $status
  0
  14:49:33 [alex@zen:~/l/q/b/all] review/misc-bits|… + docker run --rm -it 
qemu:ubuntu pkg-config --cflags libzstd

  14:49:45 [alex@zen:~/l/q/b/all] review/misc-bits|… + docker run --rm -it 
qemu:ubuntu pkg-config --libs libzstd
  -lzstd
  14:51:14 [alex@zen:~/l/q/b/all] review/misc-bits|… + docker run --rm -it 
qemu:ubuntu dpkg --status libzstd-dev
  Package: libzstd-dev
  Status: install ok installed
  Priority: optional
  Section: libdevel
  Installed-Size: 985
  Maintainer: Ubuntu Developers <address@hidden>
  Architecture: amd64
  Multi-Arch: same
  Source: libzstd
  Version: 1.3.8+dfsg-3
  Depends: libzstd1 (= 1.3.8+dfsg-3)
  Description: fast lossless compression algorithm -- development files
   Zstd, short for Zstandard, is a fast lossless compression algorithm, 
targeting
   real-time compression scenarios at zlib-level compression ratio.
   .
   This package contains the headers and static library.
  Original-Maintainer: Debian Med Packaging Team <address@hidden>
  Homepage: https://github.com/facebook/zstd


-- 
Alex Bennée