Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HDF5: Fix the build with Intel compiler #2050

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions components/io-libs/hdf5/SOURCES/fix-intel-compiler.patch
Original file line number Diff line number Diff line change
@@ -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()

2 changes: 2 additions & 0 deletions components/io-libs/hdf5/SPECS/hdf5.spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ License: Hierarchical Data Format (HDF) Software Library and Utilities License
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)
Expand All @@ -49,6 +50,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

Expand Down
Loading