- try with CMAKE_INSTALL_LIBDIR for local nanopb

diff --git a/criterion-shared-nanopb.patch b/criterion-shared-nanopb.patch
index f4b7708b1b665221244dba0250ed0fd82f4ec728..44a7123d95bf7dab2956d810458e6c8217ba0854 100644 (file)
--- a/criterion-shared-nanopb.patch
+++ b/criterion-shared-nanopb.patch
@@ -9,3 +9,11 @@
  must_regenerate_pb = nanopb.found()
  if not nanopb.found()
        nanopb_proj = cmake.subproject('nanopb',
+@@ -181,6 +181,7 @@ if not nanopb.found()
+               cmake_options: [
+                       '-Dnanopb_BUILD_GENERATOR=OFF',
+                       '-DBUILD_SHARED_LIBS=OFF',
++                      '-DCMAKE_INSTALL_LIBDIR=' + get_option('libdir'),
+                       '-DCMAKE_C_FLAGS=-DPB_ENABLE_MALLOC=1 -DPB_NO_PACKED_STRUCTS=1',
+                       '-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
+               ])

diff --git a/criterion.spec b/criterion.spec
index acd699b975075b5b0fb2a758c816b4005e3603be..ce3ac707eff50b71c726d297ea24889ec123c9fc 100644 (file)
--- a/criterion.spec
+++ b/criterion.spec
@@ -76,7 +76,6 @@ Statyczne biblioteki criterion.
 
 %build
 %meson build \
-       --default-library=shared \
        -Dtests=%{__true_false tests}
 
 %ninja_build -C build