[oe-core][zeus][PATCH] cmake-native: Use cmake-provided zstd library; system library might be too old.

[oe-core][zeus][PATCH] cmake-native: Use cmake-provided zstd library; system library might be too old.

[Leon Woestenberg]

On Mint 19.2 (based on Ubuntu 18.04.2), if the system library zstd is present,
the compile fails as follows:

<...>/tmp/work/x86_64-linux/cmake-native/3.15.3-r0/cmake-3.15.3/Utilities/cmlibarchive/libarchive/archive_read_support_filter_zstd.c:59:2:
error: unknown type name ‘ZSTD_DStream’
|   ZSTD_DStream *dstream;
|   ^

cat ./tmp/work/x86_64-linux/cmake-native/3.15.3-r0/temp/log.do_configure | grep -i ZSTD
-- Using system-installed ZSTD
-- Found ZSTD: /usr/lib/x86_64-linux-gnu/libzstd.so

grep -rne ZSTD_DStream /usr/include/zstd.h
<no output>

The fix in this commit is to use the cmake provided zstd library:

    -DCMAKE_USE_SYSTEM_LIBRARY_ZSTD=0 \

so that on supported distributions, we do not depend on the system zstd library (version).

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
---
 meta/recipes-devtools/cmake/cmake-native_3.15.3.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
index b2952ee..e0ac3f8 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
@@ -21,6 +21,7 @@ CMAKE_EXTRACONF = "\
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
+    -DCMAKE_USE_SYSTEM_LIBRARY_ZSTD=0 \
     -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
     -DHAVE_SYS_ACL_H=0 \
 "
-- 
2.7.4

Re: [oe-core][zeus][PATCH] cmake-native: Use cmake-provided zstd library; system library might be too old.

[Ross Burton]

Is this Zeus specific, or should it also be merged into master and dunfell?

Ross

On Thu, 13 Aug 2020 at 12:52, Leon Woestenberg <leon@sidebranch.com> wrote:
>
> On Mint 19.2 (based on Ubuntu 18.04.2), if the system library zstd is present,
> the compile fails as follows:
>
> <...>/tmp/work/x86_64-linux/cmake-native/3.15.3-r0/cmake-3.15.3/Utilities/cmlibarchive/libarchive/archive_read_support_filter_zstd.c:59:2:
> error: unknown type name ‘ZSTD_DStream’
> |   ZSTD_DStream *dstream;
> |   ^
>
> cat ./tmp/work/x86_64-linux/cmake-native/3.15.3-r0/temp/log.do_configure | grep -i ZSTD
> -- Using system-installed ZSTD
> -- Found ZSTD: /usr/lib/x86_64-linux-gnu/libzstd.so
>
> grep -rne ZSTD_DStream /usr/include/zstd.h
> <no output>
>
> The fix in this commit is to use the cmake provided zstd library:
>
>     -DCMAKE_USE_SYSTEM_LIBRARY_ZSTD=0 \
>
> so that on supported distributions, we do not depend on the system zstd library (version).
>
> Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
> ---
>  meta/recipes-devtools/cmake/cmake-native_3.15.3.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
> index b2952ee..e0ac3f8 100644
> --- a/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
> +++ b/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
> @@ -21,6 +21,7 @@ CMAKE_EXTRACONF = "\
>      -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
>      -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
>      -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
> +    -DCMAKE_USE_SYSTEM_LIBRARY_ZSTD=0 \
>      -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
>      -DHAVE_SYS_ACL_H=0 \
>  "
> --
> 2.7.4
>
> 

Re: [oe-core][zeus][PATCH] cmake-native: Use cmake-provided zstd library; system library might be too old.

[Leon Woestenberg]

[-- Attachment #1: Type: text/plain, Size: 2461 bytes --]

On Fri, 14 Aug 2020 at 12:00, Ross Burton <ross@burtonini.com> wrote:

> Is this Zeus specific, or should it also be merged into master and dunfell?



Good point. I will see into the supported distro's for dunfell and see if I
can replicate the issue there.

Note that if the zstd system library is not installed, cmake-native will
build, configured without zstd archive support.

I will come back with the result, if it is preferable to wait for that
result, disregard this patch.


>
> Ross
>
> On Thu, 13 Aug 2020 at 12:52, Leon Woestenberg <leon@sidebranch.com>
> wrote:
> >
> > On Mint 19.2 (based on Ubuntu 18.04.2), if the system library zstd is
> present,
> > the compile fails as follows:
> >
> >
> <...>/tmp/work/x86_64-linux/cmake-native/3.15.3-r0/cmake-3.15.3/Utilities/cmlibarchive/libarchive/archive_read_support_filter_zstd.c:59:2:
> > error: unknown type name ‘ZSTD_DStream’
> > |   ZSTD_DStream *dstream;
> > |   ^
> >
> > cat ./tmp/work/x86_64-linux/cmake-native/3.15.3-r0/temp/log.do_configure
> | grep -i ZSTD
> > -- Using system-installed ZSTD
> > -- Found ZSTD: /usr/lib/x86_64-linux-gnu/libzstd.so
> >
> > grep -rne ZSTD_DStream /usr/include/zstd.h
> > <no output>
> >
> > The fix in this commit is to use the cmake provided zstd library:
> >
> >     -DCMAKE_USE_SYSTEM_LIBRARY_ZSTD=0 \
> >
> > so that on supported distributions, we do not depend on the system zstd
> library (version).
> >
> > Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
> > ---
> >  meta/recipes-devtools/cmake/cmake-native_3.15.3.bb | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
> b/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
> > index b2952ee..e0ac3f8 100644
> > --- a/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
> > +++ b/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb
> > @@ -21,6 +21,7 @@ CMAKE_EXTRACONF = "\
> >      -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
> >      -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
> >      -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
> > +    -DCMAKE_USE_SYSTEM_LIBRARY_ZSTD=0 \
> >      -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
> >      -DHAVE_SYS_ACL_H=0 \
> >  "
> > --
> > 2.7.4
> >
> > 
>
-- 
-- 
Leon Woestenberg
leon@sidebranch.com
T: +31 40 711 42 76
M: +31 6 472 30 372

Sidebranch Embedded Systems
Eindhoven, The Netherlands
http://www.sidebranch.com

[-- Attachment #2: Type: text/html, Size: 4981 bytes --]