commit 6a34c1958c5fa43687a66d630c96b02ddc4ce2d2
Author: Jan Rękorajski <[email protected]>
Date: Wed Dec 4 10:03:34 2024 +0100
- fix fortan build and package
hdf5.spec | 8 ++++++--
ix86-short-real.patch | 11 +++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index c717a11..cf208ff 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -18,6 +18,7 @@ License: Nearly BSD, but changed sources must be marked
Group: Libraries
Source0:
https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_5/downloads/%{name}-%{version}.tar.gz
# Source0-md5: 600d29af6ccb7f1e3401560e1422ba5e
+Patch0: ix86-short-real.patch
Patch1: %{name}-cmake.patch
URL: https://www.hdfgroup.org/solutions/hdf5/
BuildRequires: autoconf >= 2.69
@@ -193,7 +194,10 @@ Natywny interfejs Javy (JNI) do biblioteki standardowej
HDF5.
%prep
%setup -q
-%patch1 -p1
+%ifarch %{ix86}
+%patch -P 0 -p1
+%endif
+%patch -P 1 -p1
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\\1,' \
utils/subfiling_vfd/h5fuse.in
@@ -372,7 +376,6 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/H5Zdevelop.h
%{_includedir}/H5Zpublic.h
%{_includedir}/H5api_adpt.h
-%{_includedir}/H5config_f.inc
%{_includedir}/H5overflow.h
%{_includedir}/H5pubconf.h
%{_includedir}/H5public.h
@@ -459,6 +462,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libhdf5hl_fortran.la
%{_includedir}/H5f90i.h
%{_includedir}/H5f90i_gen.h
+%{_includedir}/H5config_f.inc
%{_includedir}/*.mod
%files fortran-static
diff --git a/ix86-short-real.patch b/ix86-short-real.patch
new file mode 100644
index 0000000..fbb4d0b
--- /dev/null
+++ b/ix86-short-real.patch
@@ -0,0 +1,11 @@
+--- hdf5-1.14.5/fortran/test/tH5T_F03.F90~ 2024-09-30 18:07:53.000000000
+0200
++++ hdf5-1.14.5/fortran/test/tH5T_F03.F90 2024-12-04 10:00:48.065978864
+0100
+@@ -1181,7 +1181,7 @@
+ CALL verify("h5kind_to_type",dset_data_r(i),data_out_r(i),total_error)
+ CALL
verify("h5kind_to_type",dset_data_r7(i),data_out_r7(i),total_error)
+ CALL
verify("h5kind_to_type",dset_data_r15(i),data_out_r15(i),total_error)
+- CALL
verify("h5kind_to_type",dset_data_r31(i),data_out_r31(i),total_error)
++! CALL
verify("h5kind_to_type",dset_data_r31(i),data_out_r31(i),total_error)
+ END DO
+
+ !
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf5.git/commitdiff/6a34c1958c5fa43687a66d630c96b02ddc4ce2d2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
