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

import cmake-3.11.4-7.el8

This commit is contained in:
CentOS Sources 2020-04-28 04:53:25 -04:00 committed by Andrew Lukoshko
parent 352e318689
commit aa16d36d72
4 changed files with 112 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
SOURCES/0001-FindMPI-Restore-MPI_-LANG-_COMPILE_FLAGS-and-MPI_-LA.patch Normal file
View File

@ -0,0 +1,33 @@
From 31b8b28fedbf102740eebd7ff9148188ed00a26e Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Tue, 20 Aug 2019 17:38:53 -0400
Subject: [PATCH] FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and
MPI_<LANG>_COMPILE_OPTIONS
In commit e374b9f1eb (FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a
command-line string, 2018-09-10, v3.12.3~6^2) we tried to restore the
compile flags but accidentally inverted the arguments to `list(JOIN)`
causing both `MPI_<LANG>_COMPILE_FLAGS` and `MPI_<LANG>_COMPILE_OPTIONS`
to be empty.
Issue: #18349
---
Modules/FindMPI.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 9471be8..2b9b20c 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -1698,7 +1698,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
set(MPI_${LANG}_INCLUDE_PATH "${MPI_${LANG}_INCLUDE_DIRS}")
unset(MPI_${LANG}_COMPILE_FLAGS)
if(MPI_${LANG}_COMPILE_OPTIONS)
- list(JOIN MPI_${LANG}_COMPILE_FLAGS " " MPI_${LANG}_COMPILE_OPTIONS)
+ list(JOIN MPI_${LANG}_COMPILE_OPTIONS " " MPI_${LANG}_COMPILE_FLAGS)
endif()
if(MPI_${LANG}_COMPILE_DEFINITIONS)
foreach(_MPI_DEF IN LISTS MPI_${LANG}_COMPILE_DEFINITIONS)
--
1.8.3.1

32
SOURCES/0001-FindMPI-Restore-MPI_-LANG-_COMPILE_FLAGS-as-a-comman.patch Normal file
View File

@ -0,0 +1,32 @@
From e374b9f1ebae70ca4381588362d6d3418f832ea7 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 10 Sep 2018 14:30:59 -0400
Subject: [PATCH] FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a command-line
string
Refactoring in commit v3.10.0-rc1~103^2~2 (FindMPI: Modernization from
ground up, 2017-04-25) accidentally left this variable set as a copy of
the `;`-list in `MPI_<LANG>_COMPILE_OPTIONS`, but the flags variable is
documented as a command-line string. Restore it now.
Fixes: #18349
---
Modules/FindMPI.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 75c4441..bfcd876 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -1680,7 +1680,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
set(MPI_${LANG}_INCLUDE_PATH "${MPI_${LANG}_INCLUDE_DIRS}")
unset(MPI_${LANG}_COMPILE_FLAGS)
if(MPI_${LANG}_COMPILE_OPTIONS)
- set(MPI_${LANG}_COMPILE_FLAGS "${MPI_${LANG}_COMPILE_OPTIONS}")
+ list(JOIN MPI_${LANG}_COMPILE_FLAGS " " MPI_${LANG}_COMPILE_OPTIONS)
endif()
if(MPI_${LANG}_COMPILE_DEFINITIONS)
foreach(_MPI_DEF IN LISTS MPI_${LANG}_COMPILE_DEFINITIONS)
--
1.8.3.1

25
SOURCES/0001-Remove-usage-of-list-JOIN.patch Normal file
View File

@ -0,0 +1,25 @@
From 0480b1a5f6d18aee1430d7ebc7c1ae958f516d32 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 23 Jan 2020 09:05:01 -0800
Subject: [PATCH] Remove usage of list(JOIN)
---
Modules/FindMPI.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 8632d7b..4816d6e 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -1677,7 +1677,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
set(MPI_${LANG}_INCLUDE_PATH "${MPI_${LANG}_INCLUDE_DIRS}")
unset(MPI_${LANG}_COMPILE_FLAGS)
if(MPI_${LANG}_COMPILE_OPTIONS)
- list(JOIN MPI_${LANG}_COMPILE_OPTIONS " " MPI_${LANG}_COMPILE_FLAGS)
+ string(REPLACE ";" " " MPI_${LANG}_COMPILE_FLAGS "${MPI_${LANG}_COMPILE_OPTIONS}")
endif()
if(MPI_${LANG}_COMPILE_DEFINITIONS)
foreach(_MPI_DEF IN LISTS MPI_${LANG}_COMPILE_DEFINITIONS)
--
1.8.3.1

24
SPECS/cmake.spec
View File

@ -63,7 +63,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.4
Release: 3%{?relsuf}%{?dist}
Release: 7%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@ -98,6 +98,12 @@ Patch102: %{name}-mingw-dl.patch
# https://gitlab.kitware.com/cmake/cmake/merge_requests/2169
Patch103: cmake-libuv-location.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1749463
# https://gitlab.kitware.com/cmake/cmake/issues/18349
Patch104: 0001-FindMPI-Restore-MPI_-LANG-_COMPILE_FLAGS-as-a-comman.patch
Patch105: 0001-FindMPI-Restore-MPI_-LANG-_COMPILE_FLAGS-and-MPI_-LA.patch
Patch106: 0001-Remove-usage-of-list-JOIN.patch
# Patch for renaming on EPEL
%if 0%{?name_suffix:1}
Patch1: %{name}-rename.patch
@ -412,7 +418,9 @@ mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled
pushd build
#CMake.FileDownload, CTestTestUpload, and curl require internet access
# RunCMake.CPack_RPM is broken if disttag contains "+", bug #1499151
NO_TEST="CMake.FileDownload|CTestTestUpload|curl|RunCMake.CPack_RPM"
# CPackComponentsForAll-RPM-IgnoreGroup fails on RHEL8
# https://gitlab.kitware.com/cmake/cmake/issues/19983
NO_TEST="CMake.FileDownload|CTestTestUpload|curl|RunCMake.CPack_RPM|CPackComponentsForAll-RPM-IgnoreGroup"
# RunCMake.File_Generate fails on S390X
%ifarch s390x
NO_TEST="$NO_TEST|RunCMake.File_Generate"
@ -509,6 +517,18 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Tue Jan 28 2020 Tom Stellard <tstellar@redhat.com> - 3.11.4-7
- Fix test case name in dist-git
* Fri Jan 24 2020 Tom Stellard <tstellar@redhat.com> - 3.11.4-6
- Correctly fix mpi detection
* Thu Jan 23 2020 Tom Stellard <tstellar@redhat.com> - 3.11.4-5
- Remove usage of list(JOIN) from previous fix
* Wed Nov 27 2019 Tom Stellard <tstellar@redhat.com> - 3.11.4-4
- Fix bug with mpi detection
* Sat Aug 4 2018 Florian Weimer <fweimer@redhat.com> - 3.11.4-3
- Adjust to new libuv header location (#1611710)