Skip to contentSkip to conversation

cmake-native: Use cmake-provided zstd library; system library might be too old.

PATCH In review Leon Woestenberg 2 participants 3 messages Aug 13, 2020 – Aug 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmake-native: Use cmake-provided zstd library; system library might be too old.

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).

---
 meta/recipes-devtools/cmake/cmake-native_3.15.3.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/cmake/cmake-native_3.15.3.bb +1 -0
index b2952ee..e0ac3f8 100644
@@ -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 \
 "
Signature · 1 line
2.7.4
#1 lore raw

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

Ross

Quoted 43 lines · 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).

---
 meta/recipes-devtools/cmake/cmake-native_3.15.3.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/cmake/cmake-native_3.15.3.bb +1 -1
index b2952ee..e0ac3f8 100644
@@ -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

#2 lore raw
Quoted 1 line · Ross Burton

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.

Quoted 54 lines

Ross

Quoted 2 lines · Leon Woestenberg

On Mint 19.2 (based on Ubuntu 18.04.2), if the system library zstd is

present,

Quoted 3 lines

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:

Quoted 5 lines

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

Quoted 11 lines

-- 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).

Review

Quoted 7 lines
---
 meta/recipes-devtools/cmake/cmake-native_3.15.3.bb | 1 +
 1 file changed, 1 insertion(+)
(quoted diff) +0 -0

b/meta/recipes-devtools/cmake/cmake-native_3.15.3.bb

Quoted 15 lines

index b2952ee..e0ac3f8 100644

meta/recipes-devtools/cmake/cmake-native_3.15.3.bb +1 -1
@@ -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

Signature · 9 lines
-- 
Leon Woestenberg
[email protected]
T: +31 40 711 42 76
M: +31 6 472 30 372

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