From 4b54e425d39f6dc76717947e4717429cb4ffb613 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 31 Oct 2024 13:31:10 +0000 Subject: [PATCH] Revert "PHDF5: Fix the build with Intel compiler" This reverts commit d938eda6f47b557a5de0ad7383309799a7ae76d4. Signed-off-by: Adrian Reber --- .../phdf5/SOURCES/fix-intel-compiler.patch | 21 ------------------- components/io-libs/phdf5/SPECS/hdf5.spec | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 components/io-libs/phdf5/SOURCES/fix-intel-compiler.patch diff --git a/components/io-libs/phdf5/SOURCES/fix-intel-compiler.patch b/components/io-libs/phdf5/SOURCES/fix-intel-compiler.patch deleted file mode 100644 index 4f30399fcc..0000000000 --- a/components/io-libs/phdf5/SOURCES/fix-intel-compiler.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/config/cmake/HDF5UseFortran.cmake 2024-10-25 15:16:10.038600011 +0300 -+++ b/config/cmake/HDF5UseFortran.cmake 2024-10-25 15:16:40.464403575 +0300 -@@ -218,10 +218,6 @@ - string (REGEX REPLACE "," ";" VAR "${pac_validLogicalKinds}") - - set(CMAKE_REQUIRED_QUIET TRUE) -- set(save_CMAKE_Fortran_FLAGS ${CMAKE_Fortran_FLAGS}) -- if (CMAKE_Fortran_COMPILER_ID MATCHES "Intel") -- set(CMAKE_Fortran_FLAGS "-warn error") -- endif () - - foreach (KIND ${VAR}) - unset(MPI_LOGICAL_KIND CACHE) -@@ -248,7 +244,6 @@ - message (FATAL_ERROR "Failed to determine LOGICAL KIND for MPI") - endif () - set(CMAKE_REQUIRED_QUIET FALSE) -- set(CMAKE_Fortran_FLAGS ${save_CMAKE_Fortran_FLAGS}) - endif() - endif() - diff --git a/components/io-libs/phdf5/SPECS/hdf5.spec b/components/io-libs/phdf5/SPECS/hdf5.spec index 77874a11bc..fc7861c5d7 100644 --- a/components/io-libs/phdf5/SPECS/hdf5.spec +++ b/components/io-libs/phdf5/SPECS/hdf5.spec @@ -25,7 +25,6 @@ Group: %{PROJ_NAME}/io-libs URL: http://www.hdfgroup.org/HDF5 Source0: https://github.com/HDFGroup/%{pname}/archive/refs/tags/%{pname}_%{version}.tar.gz -Patch1: fix-intel-compiler.patch BuildRequires: zlib-devel make BuildRequires: perl(File::Compare) @@ -51,7 +50,6 @@ grids. You can also mix and match them in HDF5 files according to your needs. %prep %setup -q -n %{pname}-%{pname}_%{version} -%patch -P1 -p1 %build # override with newer config.guess for aarch64