rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update fix for rhbz#2027118 with upstream solution

Browse Source
This commit is contained in:
Björn Esser 2021-12-01 18:41:40 +01:00
parent c8720654f4
commit 4da2a4b8c1
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cmake-3.22.0-rhbz2027118.patch
View File

@ -1,29 +1,34 @@
From 2066bbfedc068a5adc21338d100216471e4aadc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Sun, 28 Nov 2021 21:03:37 +0100
Subject: [PATCH] Fix rhbz#2027118.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From 7896991af029d66c9e1692ce18027fafaa0e9bd8 Mon Sep 17 00:00:00 2001
From: Robert Maynard <rmaynard@nvidia.com>
Date: Mon, 29 Nov 2021 13:47:16 -0500
Subject: [PATCH] GNUInstallDirs: Prefer system lib64 over conda lib when
ambiguous
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
Update logic added by commit ecaca8c129 (GNUInstallDirs now aware of
conda lib directory requirements, 2021-09-08, v3.22.0-rc1~142^2).
When it is ambiguous if we are doing a conda install or a system
install prefer using the system library directory.
Fixes: #22962
---
Modules/GNUInstallDirs.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modules/GNUInstallDirs.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 489c233197..b02d090436 100644
index 6ca424ad5d..01bd63716c 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -281,7 +281,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
@@ -253,7 +253,9 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
elseif(DEFINED ENV{CONDA_PREFIX})
set(conda_prefix "$ENV{CONDA_PREFIX}")
cmake_path(ABSOLUTE_PATH conda_prefix NORMALIZE)
- if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix)
+ if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix AND
+ NOT ("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$" OR
+ "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$"))
set(__system_type_for_install "conda")
endif()
endif()
- elseif(NOT DEFINED __system_type_for_install)
+ else()
# not debian, alpine, arch, or conda so rely on CMAKE_SIZEOF_VOID_P:
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(_LIBDIR_DEFAULT "lib64")
--
2.33.1
GitLab

8
cmake.spec
View File

@ -68,7 +68,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 2
%global baserelease 3
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@ -110,7 +110,8 @@ Patch101: %{name}-fedora-flag_release.patch
# https://gitlab.kitware.com/cmake/cmake/issues/17600
Patch102: %{name}-mingw-dl.patch
# rhbz#2027118
Patch103: %{name}-3.22.0-rhbz2027118.patch
# https://gitlab.kitware.com/cmake/cmake/-/issues/22962
Patch103: https://gitlab.kitware.com/cmake/cmake/-/commit/7896991af029d66c9e1692ce18027fafaa0e9bd8.patch#/%{name}-3.22.0-rhbz2027118.patch
# Patch for renaming on EPEL
%if 0%{?name_suffix:1}
@ -528,6 +529,9 @@ popd
%changelog
* Wed Dec 01 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-3
- Update fix for rhbz#2027118 with upstream solution
* Sun Nov 28 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-2
- Add patch to partially revert incompatible changes in GNUInstallDirs.cmake
Fixes rhbz#2027118