public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/abseil-cpp] rawhide: Use the cmake declarative buildsystem
@ 2026-09-09 17:13 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-09-09 17:13 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/abseil-cpp
Branch : rawhide
Commit : adc6fc9dacbf0fa225e1b6b80929e60b6014200a
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-09T13:07:15+01:00
Stats  : +21/-21 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/abseil-cpp/c/adc6fc9dacbf0fa225e1b6b80929e60b6014200a?branch=rawhide

Log:
Use the cmake declarative buildsystem

---
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 26428a3..56817ba 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,3 +1,4 @@
+%bcond ctest 1
 %bcond mingw %{defined fedora}
 
 # Installed library version
@@ -33,7 +34,23 @@ Source:         https://github.com/abseil/abseil-cpp/archive/%{version}/abseil-c
 # e.g., when targeting x86_64-v3 on ELN/RHEL.
 Patch:          https://github.com/abseil/abseil-cpp/commit/d851fdd768b27c02b3fb786fd0987faddd279ece.patch
 
-BuildRequires:  cmake
+BuildSystem:    cmake
+
+BuildOption(conf): -DABSL_ENABLE_INSTALL:BOOL=ON
+BuildOption(conf): -DABSL_FIND_GOOGLETEST:BOOL=ON
+BuildOption(conf): -DABSL_USE_EXTERNAL_GOOGLETEST:BOOL=ON
+BuildOption(conf): -DCMAKE_BUILD_TYPE:STRING=None
+BuildOption(conf): -DCMAKE_CXX_STANDARD:STRING=17
+%if %{defined ctest}
+BuildOption(conf): -DABSL_BUILD_TESTING:BOOL=ON
+%else
+BuildOption(conf): -DABSL_BUILD_TESTING:BOOL=OFF
+%endif
+# Needed to build libraries for the -testing subpackage when tests are not
+# enabled: therefore redundant here, but still supplied to be more explicit.
+BuildOption(conf): -DABSL_BUILD_TEST_HELPERS:BOOL=ON
+BuildOption(check): --exclude-regex "${skips}"
+
 BuildRequires:  gcc-c++
 # The ninja backend for CMake (which is observably faster than the UNIX
 # Makefiles backend) is the default since
@@ -128,34 +145,19 @@ MinGW Windows abseil-cpp library.
 %prep
 %autosetup -p1
 
-%build
-# ABSL_BUILD_TEST_HELPERS is needed to build libraries for the -testing
-# subpackage when tests are not enabled. It is therefore redundant here, but we
-# still supply it to be more explicit.
-%cmake \
-    -DABSL_USE_EXTERNAL_GOOGLETEST:BOOL=ON \
-    -DABSL_FIND_GOOGLETEST:BOOL=ON \
-    -DABSL_ENABLE_INSTALL:BOOL=ON \
-    -DABSL_BUILD_TESTING:BOOL=ON \
-    -DABSL_BUILD_TEST_HELPERS:BOOL=ON \
-    -DCMAKE_BUILD_TYPE:STRING=None \
-    -DCMAKE_CXX_STANDARD:STRING=17
-%cmake_build
-
 %if %{with mingw}
+%build -a
 %mingw_cmake -GNinja -DABSL_BUILD_TESTING:BOOL=OFF
 %mingw_ninja --verbose
 %endif
 
-%install
-%cmake_install
-
 %if %{with mingw}
+%install -a
 %mingw_ninja_install
 %mingw_debug_install_post
 %endif
 
-%check
+%check -p
 skips='^($.'
 %ifarch ppc64le %{ix86}
 # [Bug]: Flaky test failures in absl_failure_signal_handler_test on ppc64le in
@@ -191,8 +193,6 @@ skips="${skips}|absl_kernel_timeout_internal_test"
 %endif
 skips="${skips})$"
 
-%ctest --exclude-regex "${skips}"
-
 %files
 %license LICENSE
 %doc FAQ.md README.md UPGRADES.md

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-09 17:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-09 17:13 [rpms/abseil-cpp] rawhide: Use the cmake declarative buildsystem Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox