Add upstream patch to fix linking non-builtin libatomic on some arches

This commit is contained in:
Björn Esser 2023-08-28 17:51:07 +02:00
parent 94df49d123
commit cbd49edade
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From fa3c4b6dbfaa4eb1d666c1bea4c759d221b7ad98 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 24 Aug 2023 13:00:13 -0400
Subject: [PATCH] Source: Link libatomic when needed on any Linux architecture
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Extend commit 78bbd58545 (Source: Link libatomic when needed on Linux
32-bit ARM, 2023-07-27, v3.27.2~10^2) to check for libatomic on more
architectures.
Fixes: #25204
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
---
Source/Checks/cm_cxx_features.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index 98d5eff072..02627464cc 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -96,7 +96,7 @@ else()
set(CMake_HAVE_CXX_FILESYSTEM FALSE)
endif()
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l|sparc")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|aarch64)$")
cm_check_cxx_feature(atomic_builtin)
if(NOT CMake_HAVE_CXX_ATOMIC_BUILTIN)
set(cm_check_cxx_feature_LINK_LIBRARIES atomic)
--
2.41.0

View File

@ -72,7 +72,7 @@
%global patch_version 4
# For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 1
%global baserelease 2
# Set to RC version if building RC, else comment out.
#global rcsuf rc1
@ -123,6 +123,9 @@ Patch100: %{name}-findruby.patch
Patch1: %{name}-rename.patch
%endif
# https://gitlab.kitware.com/cmake/cmake/-/issues/25204
Patch10001: 0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: gcc-c++
@ -549,6 +552,9 @@ popd
%changelog
* Mon Aug 28 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-2
- Add upstream patch to fix linking non-builtin libatomic on some arches
* Thu Aug 24 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-1
- cmake-3.27.4
Fixes rhbz#2233852