PHDF5: Fix the build with Intel compiler

Uses a patch to revert HDFGroup/hdf5@f6ae241#diff-eff1bae8d512738be4c5337b594867ef4f22b5f8940b8fbdcc3e9a78e1419bb6R225 Also see HDFGroup/hdf5#4637 Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
openhpc · Oct 28, 2024 · d938eda · d938eda
1 parent 1877b42
commit d938eda
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/components/io-libs/phdf5/SOURCES/fix-intel-compiler.patch b/components/io-libs/phdf5/SOURCES/fix-intel-compiler.patch
@@ -0,0 +1,21 @@
+--- 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
@@ -25,6 +25,7 @@ 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)
@@ -50,6 +51,7 @@ 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