From 8d5bce45edba238a7fd4e401aba5abafc6fe4ac452fdb0fdcf33a0a4ffba0c09 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 2 Apr 2025 07:38:15 +0000 Subject: [PATCH] Accepting request 1266321 from home:AndreasStieger:branches:devel:tools - build without rules support on Tumbleweed to remove pcre dependency See https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/BK3SPPFOM3LI6K5PTXPKZMKMIUIPOEXS/ OBS-URL: https://build.opensuse.org/request/show/1266321 OBS-URL: https://build.opensuse.org/package/show/devel:tools/cppcheck?expand=0&rev=148 --- cppcheck.changes | 6 ++++++ cppcheck.spec | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/cppcheck.changes b/cppcheck.changes index da7081f..e53004b 100644 --- a/cppcheck.changes +++ b/cppcheck.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 1 21:02:32 UTC 2025 - Andreas Stieger + +- build without rules support on Tumbleweed to remove pcre + dependency + ------------------------------------------------------------------- Wed Feb 26 09:39:24 UTC 2025 - Dirk Müller diff --git a/cppcheck.spec b/cppcheck.spec index 534c327..2e5253f 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -16,6 +16,11 @@ # +%if 0%{?suse_version} > 1600 +%bcond_with rules +%else +%bcond_without rules +%endif Name: cppcheck Version: 2.17.1 Release: 0 @@ -39,7 +44,9 @@ BuildRequires: pkgconfig(Qt6Network) BuildRequires: pkgconfig(Qt6PrintSupport) BuildRequires: pkgconfig(Qt6Test) BuildRequires: pkgconfig(Qt6Widgets) +%if %{with rules} BuildRequires: pkgconfig(libpcre) +%endif ExcludeArch: %ix86 %arm Requires: python3-Pygments @@ -82,7 +89,11 @@ doesn't see. -DFILESDIR="%{_datadir}/%{name}" \ -DBUILD_GUI=ON \ -DBUILD_TESTS=ON \ - -DHAVE_RULES=yes \ +%if %{with rules} + -DHAVE_RULES=ON \ +%else + -DHAVE_RULES=OFF \ +%endif -DUSE_QT6=yes \ -DUSE_Z3=yes %cmake_build