Update hdf5 to 1.12.1.

Initiated by a diff from jmeister@posteo.ch.
This commit is contained in:
martin 2022-03-07 11:10:52 +00:00
parent d7d1ee8cf9
commit 347e4c9d12
11 changed files with 30 additions and 112 deletions

View File

@ -1,19 +1,17 @@
# $OpenBSD: Makefile,v 1.23 2021/10/28 14:46:11 jca Exp $
# gfortran
ONLY_FOR_ARCHS = ${GCC49_ARCHS}
COMMENT = Hierarchical Data Format 5 Technology suite
V = 1.12.0
V = 1.12.1
DISTNAME = hdf5-${V}
SHARED_LIBS += hdf5 3.0 # 200.0
SHARED_LIBS += hdf5_cpp 7.0 # 200.0
SHARED_LIBS += hdf5_hl 3.0 # 200.0
SHARED_LIBS += hdf5_hl_cpp 4.0 # 200.0
SHARED_LIBS += hdf5_fortran 0.0 # 200.0
SHARED_LIBS += hdf5hl_fortran 0.0 # 200.0
SHARED_LIBS += hdf5 4.0 # 201.0
SHARED_LIBS += hdf5_cpp 8.0 # 201.0
SHARED_LIBS += hdf5_hl 3.1 # 200.1
SHARED_LIBS += hdf5_hl_cpp 4.1 # 200.1
SHARED_LIBS += hdf5_fortran 1.0 # 201.0
SHARED_LIBS += hdf5hl_fortran 0.1 # 200.1
CATEGORIES = math
@ -28,14 +26,15 @@ WANTLIB += c m ${COMPILER_LIBCXX} z
COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES = https://support.hdfgroup.org/ftp/HDF5/current/src/ \
https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-${V}/src/
MASTER_SITES = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-${V}/src/ \
https://support.hdfgroup.org/ftp/HDF5/current/src/
MODULES = fortran
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-cxx \
--enable-fortran \
FC=egfortran \
--with-examplesdir=${PREFIX}/share/examples/hdf5
post-install:

View File

@ -1,2 +1,2 @@
SHA256 (hdf5-1.12.0.tar.gz) = pi3LJ2ZYy3jmeV3Sm/km7XqbxO3253AlzSxomo+XwXo=
SIZE (hdf5-1.12.0.tar.gz) = 12580850
SHA256 (hdf5-1.12.1.tar.gz) = ecZv9n5mZmU2k5bpyQsy4jjlAfNFr9IjQYa/uDMQgco=
SIZE (hdf5-1.12.1.tar.gz) = 13534796

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-c++_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
Index: c++/examples/Makefile.in
--- c++/examples/Makefile.in.orig
+++ c++/examples/Makefile.in
@@ -709,8 +709,8 @@ CXX_API = yes
# Where to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR = $(examplesdir)/c++
-EXAMPLETOPDIR = $(examplesdir)
+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/c++
+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
Index: examples/Makefile.in
--- examples/Makefile.in.orig
+++ examples/Makefile.in
@@ -725,8 +725,8 @@ EXTLINK_DIRS = red blue u2w
# Example directory
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR = $(examplesdir)/c
-EXAMPLETOPDIR = $(examplesdir)
+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/c
+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)
@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
# Assume that all tests in this directory are examples, and tell

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-fortran_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
Index: fortran/examples/Makefile.in
--- fortran/examples/Makefile.in.orig
+++ fortran/examples/Makefile.in
@@ -722,8 +722,8 @@ FORTRAN_API = yes
# Tell automake how to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR = $(examplesdir)/fortran
-EXAMPLETOPDIR = $(examplesdir)
+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/fortran
+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-hl_c++_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
Index: hl/c++/examples/Makefile.in
--- hl/c++/examples/Makefile.in.orig
+++ hl/c++/examples/Makefile.in
@@ -698,8 +698,8 @@ CXX_API = yes
# Where to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR = $(examplesdir)/hl/c++
-EXAMPLETOPDIR = $(examplesdir)/hl
+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/hl/c++
+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)/hl
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-hl_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
Index: hl/examples/Makefile.in
--- hl/examples/Makefile.in.orig
+++ hl/examples/Makefile.in
@@ -687,8 +687,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.
# Example directory
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR = $(examplesdir)/hl/c
-EXAMPLETOPDIR = $(examplesdir)/hl
+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/hl/c
+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)/hl
INSTALL_SCRIPT_FILES = run-hlc-ex.sh
INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-hl_fortran_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
Index: hl/fortran/examples/Makefile.in
--- hl/fortran/examples/Makefile.in.orig
+++ hl/fortran/examples/Makefile.in
@@ -711,8 +711,8 @@ FORTRAN_API = yes
# Tell automake how to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR = $(examplesdir)/hl/fortran
-EXAMPLETOPDIR = $(examplesdir)/hl
+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/hl/fortran
+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)/hl
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.

View File

@ -0,0 +1,13 @@
Already fixed upstream.
Index: m4/aclocal_fc.f90
--- m4/aclocal_fc.f90.orig
+++ m4/aclocal_fc.f90
@@ -151,6 +151,7 @@ PROGRAM FC_AVAIL_KINDS
WRITE(8,'(I0)') max_decimal_prec
WRITE(8,'(I0)') num_ikinds
WRITE(8,'(I0)') num_rkinds
+ CLOSE(8)
END PROGRAM FC_AVAIL_KINDS
!---- END ----- Determine the available KINDs for REALs and INTEGERs

View File

@ -1,5 +1,3 @@
$OpenBSD: patch-tools_test_h5repack_h5repack_plugin_sh_in,v 1.1 2020/12/02 13:27:54 martin Exp $
Index: tools/test/h5repack/h5repack_plugin.sh.in
--- tools/test/h5repack/h5repack_plugin.sh.in.orig
+++ tools/test/h5repack/h5repack_plugin.sh.in

View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST,v 1.8 2020/12/02 13:27:55 martin Exp $
@bin bin/gif2h5
@bin bin/h52gif
bin/h5c++
@ -21,6 +20,8 @@ bin/h5redeploy
@bin bin/h5stat
@bin bin/h5unjam
@bin bin/h5watch
@comment bin/mirror_server
@comment bin/mirror_server_stop
include/H5ACpublic.h
include/H5AbstractDs.h
include/H5Apublic.h
@ -52,12 +53,14 @@ include/H5FDdirect.h
include/H5FDfamily.h
include/H5FDhdfs.h
include/H5FDlog.h
include/H5FDmirror.h
include/H5FDmpi.h
include/H5FDmpio.h
include/H5FDmulti.h
include/H5FDpublic.h
include/H5FDros3.h
include/H5FDsec2.h
include/H5FDsplitter.h
include/H5FDstdio.h
include/H5FDwindows.h
include/H5FaccProp.h
@ -190,6 +193,7 @@ share/examples/hdf5/c/h5_crtdat.c
share/examples/hdf5/c/h5_crtgrp.c
share/examples/hdf5/c/h5_crtgrpar.c
share/examples/hdf5/c/h5_crtgrpd.c
share/examples/hdf5/c/h5_debug_trace.c
share/examples/hdf5/c/h5_drivers.c
share/examples/hdf5/c/h5_elink_unix2win.c
share/examples/hdf5/c/h5_extend.c