From c0cb262c26e9a09e73a52751807f5cdd3c35826f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 1 Sep 2023 18:11:43 +0200 Subject: [PATCH] - updated to 2.4.2, reenabled system nanopb --- criterion-shared-nanopb.patch | 24 ++++++++---------------- criterion.spec | 16 ++++++++-------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/criterion-shared-nanopb.patch b/criterion-shared-nanopb.patch index 44a7123..cfce02c 100644 --- a/criterion-shared-nanopb.patch +++ b/criterion-shared-nanopb.patch @@ -1,19 +1,11 @@ ---- criterion-2.4.1/meson.build.orig 2022-04-26 08:55:00.518896600 +0200 -+++ criterion-2.4.1/meson.build 2022-11-21 20:40:59.950706878 +0100 -@@ -174,7 +174,7 @@ else - config.set('NN_REQREP_H', '') +--- criterion-2.4.2/meson.build.orig 2023-09-01 10:21:07.575847344 +0200 ++++ criterion-2.4.2/meson.build 2023-09-01 16:43:34.211113324 +0200 +@@ -181,7 +181,7 @@ else endif --nanopb = dependency('nanopb', required: false, method: 'cmake', modules: ['nanopb::protobuf-nanopb-static']) -+nanopb = dependency('nanopb', required: false, method: 'cmake', modules: ['nanopb::protobuf-nanopb']) + nanopb = dependency('nanopb', required: get_option('wrap_mode') == 'nofallback', method: 'cmake', +- modules: ['nanopb::protobuf-nanopb-static']) ++ modules: ['nanopb::protobuf-nanopb']) 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', - ]) + if (not nanopb.found() + or get_option('wrap_mode') == 'forcefallback' diff --git a/criterion.spec b/criterion.spec index 9c211c4..3b76d27 100644 --- a/criterion.spec +++ b/criterion.spec @@ -1,31 +1,31 @@ # TODO: # - system boxfort (when released): https://github.com/diacritic/BoxFort -# - system nanopb (0.4.5 bundled) +# - system nanopb (0.4.7 bundled) # - system libcsptr (when some post-2017 release made): https://github.com/Snaipe/libcsptr # # Conditional build: -%bcond_without tests # build without tests -%bcond_with system_nanopb # system nanopb (tests fail with nanopb 0.4.7) +%bcond_without tests # testing +%bcond_without system_nanopb # system nanopb # Summary: A cross-platform C and C++ unit testing framework for the 21th century Summary(pl.UTF-8): Wieloplatformowy szkielet do testów jednostkowych dla C i C++ w XXI wieku Name: criterion -Version: 2.4.1 -Release: 5 +Version: 2.4.2 +Release: 1 License: LGPL v2.1+ Group: Libraries #Source0Download: https://github.com/Snaipe/Criterion/releases Source0: https://github.com/Snaipe/Criterion/releases/download/v%{version}/%{name}-%{version}.tar.xz -# Source0-md5: 93e91812837a68524d76339409ed2008 +# Source0-md5: 20affc64bb0d00953826eba4c93bf8ab Patch0: x32.patch Patch1: %{name}-shared-nanopb.patch URL: https://github.com/Snaipe/Criterion BuildRequires: dyncall >= 1.0 BuildRequires: libffi-devel BuildRequires: libgit2-devel -BuildRequires: meson >= 0.51.0 +BuildRequires: meson >= 0.55.0 BuildRequires: nanomsg-devel >= 1.0.0 -%{?with_system_nanopb:BuildRequires: nanopb-devel >= 0.4.5} +%{?with_system_nanopb:BuildRequires: nanopb-devel >= 0.4.7} BuildRequires: ninja BuildRequires: rpmbuild(macros) >= 1.736 BuildRequires: sed >= 4.0 -- 2.44.0