commit 2bf11f8b600b02af45a876b4460dbc2e3a6b611d
Author: Jakub Bogusz <[email protected]>
Date: Fri Jan 13 21:40:19 2023 +0100
- try with CMAKE_INSTALL_LIBDIR for local nanopb
criterion-shared-nanopb.patch | 8 ++++++++
criterion.spec | 1 -
2 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/criterion.spec b/criterion.spec
index acd699b..ce3ac70 100644
--- 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
diff --git a/criterion-shared-nanopb.patch b/criterion-shared-nanopb.patch
index f4b7708..44a7123 100644
--- 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',
+ ])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/criterion.git/commitdiff/2bf11f8b600b02af45a876b4460dbc2e3a6b611d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
