Add patch to fix build with gfortran-12

This commit is contained in:
Orion Poplawski 2022-02-06 19:24:19 -07:00
parent 02b47ba987
commit a8d474b568
2 changed files with 44 additions and 1 deletions

37
hdf5-gfortran12.patch Normal file
View File

@ -0,0 +1,37 @@
commit 3ea6f8c17228d2629e419563138a6180bc4a5a6a
Author: Orion Poplawski <orion@nwra.com>
Date: Sun Jan 30 15:21:08 2022 -0700
Mark minusone as a PARAMETER in tH5A_1_8.F90.
diff --git a/fortran/test/tH5A_1_8.F90 b/fortran/test/tH5A_1_8.F90
index 4e02c58a39..c2f8e9984a 100644
--- a/fortran/test/tH5A_1_8.F90
+++ b/fortran/test/tH5A_1_8.F90
@@ -776,7 +776,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
INTEGER :: Input1
INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
- INTEGER :: minusone = -1
+ INTEGER, PARAMETER :: minusone = -1
INTEGER(HSIZE_T) :: htmp
data_dims = 0
@@ -1427,7 +1427,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
INTEGER :: u ! Local index variable
INTEGER :: Input1
INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
- INTEGER :: minusone = -1
+ INTEGER, PARAMETER :: minusone = -1
data_dims = 0
@@ -2268,7 +2268,7 @@ SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
INTEGER :: error
INTEGER :: crt_order_flags
- INTEGER :: minusone = -1
+ INTEGER, PARAMETER :: minusone = -1
! Output message about test being performed
! WRITE(*,*) " - Testing Basic Code for Attributes with Creation Order Info"

View File

@ -9,7 +9,7 @@
# You need to recompile all users of HDF5 for each version change
Name: hdf5
Version: 1.12.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD
URL: https://portal.hdfgroup.org/display/HDF5/HDF5
@ -23,6 +23,9 @@ Source1: h5comp
# For man pages
Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.12.0+repack-1~exp2.debian.tar.xz
Patch0: hdf5-LD_LIBRARY_PATH.patch
# Fix fortran build with gcc 12
# https://github.com/HDFGroup/hdf5/pull/1412
Patch1: hdf5-gfortran12.patch
# Fix java build
Patch3: hdf5-build.patch
# Remove Fedora build flags from h5cc/h5c++/h5fc
@ -504,6 +507,9 @@ fi
%changelog
* Mon Feb 07 2022 Orion Poplawski <orion@nwra.com> - 1.12.1-4
- Add patch to fix build with gfortran-12
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.12.1-3
- Rebuilt for java-17-openjdk as system jdk