Add patch to partially revert incompatible changes in GNUInstallDirs.cmake
Fixes rhbz#2027118
This commit is contained in:
parent
12df3dd3f7
commit
c8720654f4
29
cmake-3.22.0-rhbz2027118.patch
Normal file
29
cmake-3.22.0-rhbz2027118.patch
Normal file
@ -0,0 +1,29 @@
|
||||
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
|
||||
|
||||
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
|
||||
---
|
||||
Modules/GNUInstallDirs.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
|
||||
index 489c233197..b02d090436 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}")
|
||||
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
|
||||
|
@ -68,7 +68,7 @@
|
||||
%{?rcsuf:%global versuf -%{rcsuf}}
|
||||
|
||||
# For handling bump release by rpmdev-bumpspec and mass rebuild
|
||||
%global baserelease 1
|
||||
%global baserelease 2
|
||||
|
||||
# Uncomment if building for EPEL
|
||||
#global name_suffix %%{major_version}
|
||||
@ -109,6 +109,8 @@ Patch101: %{name}-fedora-flag_release.patch
|
||||
# Add dl to CMAKE_DL_LIBS on MINGW
|
||||
# https://gitlab.kitware.com/cmake/cmake/issues/17600
|
||||
Patch102: %{name}-mingw-dl.patch
|
||||
# rhbz#2027118
|
||||
Patch103: %{name}-3.22.0-rhbz2027118.patch
|
||||
|
||||
# Patch for renaming on EPEL
|
||||
%if 0%{?name_suffix:1}
|
||||
@ -526,6 +528,10 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
* Thu Nov 18 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.22.0-1
|
||||
- cmake-3.22.0 (#2024712)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user