FreeBSD Bugzilla – Attachment 250834 Details for
Bug 279183
science/hdf5-110: upgrade to 1.10.11
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Upgrade to 1.10.11 and enable MPI by default
science_hdf5-110.diff (text/plain), 9.72 KB, created by
Thierry Thomas
on 2024-05-20 16:34:13 UTC
(
hide
)
Description:
Upgrade to 1.10.11 and enable MPI by default
Filename:
MIME Type:
Creator:
Thierry Thomas
Created:
2024-05-20 16:34:13 UTC
Size:
9.72 KB
patch
obsolete
>From d1e76e8f71e6ed2fb08d5611bda2e63ec5d37ce4 Mon Sep 17 00:00:00 2001 >From: Thierry Thomas <thierry@FreeBSD.org> >Date: Mon, 20 May 2024 18:22:34 +0200 >Subject: [PATCH] science/hdf5-110: Upgrade to 1.10.11 and enable MPI by > default >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Enable MPI by default, in order to be used by new releases of MED and >Code_Aster. > >Since Iâm there use the MPI helper. >--- > science/hdf5-110/Makefile | 22 +++++++++---- > science/hdf5-110/distinfo | 6 ++-- > science/hdf5-110/pkg-plist | 67 +++++++++++++++++++------------------- > 3 files changed, 52 insertions(+), 43 deletions(-) > >diff --git a/science/hdf5-110/Makefile b/science/hdf5-110/Makefile >index 3fa2fec7d3f8..33ce59ea7262 100644 >--- a/science/hdf5-110/Makefile >+++ b/science/hdf5-110/Makefile >@@ -1,5 +1,5 @@ > PORTNAME= hdf5 >-PORTVERSION= 1.10.10 >+PORTVERSION= 1.10.11 > CATEGORIES= science archivers graphics > MASTER_SITES= https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${PORTVERSION:R}/${DISTNAME}/src/ \ > LOCAL/sunpoet >@@ -38,8 +38,7 @@ PORTSCOUT= limit:^1\.10\. > OPTIONS_DEFINE= DEBUG EXAMPLES FORTRAN SZIP > OPTIONS_RADIO= SUPPORT > OPTIONS_RADIO_SUPPORT= CXX PARALLEL >-OPTIONS_DEFAULT=CXX SZIP >-OPTIONS_DEFAULT+=FORTRAN >+OPTIONS_DEFAULT=FORTRAN PARALLEL SZIP > OPTIONS_SUB= yes > PARALLEL_DESC= Parallel support > >@@ -49,12 +48,17 @@ DEBUG_CONFIGURE_ON= --enable-build-mode=debug > FORTRAN_CONFIGURE_ENABLE= fortran > FORTRAN_CONFIGURE_ENV= F9X=${FC} > FORTRAN_USES= fortran >+PARALLEL_IMPLIES= FORTRAN > PARALLEL_CONFIGURE_ENABLE= parallel >-PARALLEL_LDFLAGS= -L${LOCALBASE}/lib -lmpi >-PARALLEL_LIB_DEPENDS= libmpi.so:net/mpich >+PARALLEL_USES= mpi pkgconfig >+PARALLEL_CFLAGS= ${MPI_CFLAGS} >+PARALLEL_VARS= FCFLAGS+=-I${LOCALBASE}/include >+PARALLEL_LDFLAGS= ${MPI_LIBS} > SZIP_CONFIGURE_ON= --with-szlib=${LOCALBASE} > SZIP_LIB_DEPENDS= libsz.so:science/libaec > >+.include <bsd.port.options.mk> >+ > post-patch: > @${REINPLACE_CMD} -e 's|hdf5_examples|examples/hdf5${PKGNAMESUFFIX}|' ${WRKSRC}/configure > @${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/config/gnu-flags >@@ -71,10 +75,14 @@ post-patch: > post-install: > ${MV} ${STAGEDIR}${PREFIX}/lib/libhdf5.settings ${STAGEDIR}${PREFIX}/lib/libhdf5${PKGNAMESUFFIX}.settings > >+post-install-PARALLEL-on: >+ ${MV} ${STAGEDIR}${PREFIX}/bin/h5pcc ${STAGEDIR}${PREFIX}/bin/h5pcc${PKGNAMESUFFIX} >+ ${MV} ${STAGEDIR}${PREFIX}/bin/h5pfc ${STAGEDIR}${PREFIX}/bin/h5pfc${PKGNAMESUFFIX} >+ > post-install-CXX-on: > ${MV} ${STAGEDIR}${PREFIX}/bin/h5cc ${STAGEDIR}${PREFIX}/bin/h5cc${PKGNAMESUFFIX} >- >-post-install-FORTRAN-on: >+.if ${PORT_OPTIONS:MFORTRAN} > ${MV} ${STAGEDIR}${PREFIX}/bin/h5fc ${STAGEDIR}${PREFIX}/bin/h5fc${PKGNAMESUFFIX} >+.endif > > .include <bsd.port.mk> >diff --git a/science/hdf5-110/distinfo b/science/hdf5-110/distinfo >index da038237e01f..f70a885b1f14 100644 >--- a/science/hdf5-110/distinfo >+++ b/science/hdf5-110/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1683227587 >-SHA256 (hdf5-1.10.10.tar.bz2) = 56bbf9577aea4f07d7ac400b59f169ab23e5887c306a63dd5cf18b49f521d28c >-SIZE (hdf5-1.10.10.tar.bz2) = 15231191 >+TIMESTAMP = 1716151876 >+SHA256 (hdf5-1.10.11.tar.bz2) = 0afc77da5c46217709475bbefbca91c0cb6f1ea628ccd8c36196cf6c5a4de304 >+SIZE (hdf5-1.10.11.tar.bz2) = 15286914 >diff --git a/science/hdf5-110/pkg-plist b/science/hdf5-110/pkg-plist >index faa7a318f5c1..446cf01e3750 100644 >--- a/science/hdf5-110/pkg-plist >+++ b/science/hdf5-110/pkg-plist >@@ -5,14 +5,15 @@ bin/h5copy-110 > bin/h5debug-110 > bin/h5diff-110 > bin/h5dump-110 >-%%FORTRAN%%%%NO_PARALLEL%%bin/h5fc-110 >+%%FORTRAN%%%%CXX%%bin/h5fc-110 > bin/h5format_convert-110 > bin/h5import-110 > bin/h5jam-110 > bin/h5ls-110 > bin/h5mkgrp-110 > %%PARALLEL%%bin/h5pcc-110 >-%%PARALLEL%%bin/h5perf-110 >+%%NO_CXX%%bin/h5perf-110 >+%%PARALLEL%%bin/h5pfc-110 > %%NO_PARALLEL%%bin/h5perf_serial-110 > bin/h5redeploy-110 > bin/h5repack-110 >@@ -136,47 +137,30 @@ lib/libhdf5-110.a > lib/libhdf5-110.settings > lib/libhdf5-110.so > lib/libhdf5-110.so.103 >-lib/libhdf5-110.so.103.4.0 >+lib/libhdf5-110.so.103.4.1 > %%CXX%%lib/libhdf5-110_cpp.a > %%CXX%%lib/libhdf5-110_cpp.so > %%CXX%%lib/libhdf5-110_cpp.so.103 >-%%CXX%%lib/libhdf5-110_cpp.so.103.4.2 >+%%CXX%%lib/libhdf5-110_cpp.so.103.4.3 > %%FORTRAN%%lib/libhdf5-110_fortran.a > %%FORTRAN%%lib/libhdf5-110_fortran.so > %%FORTRAN%%lib/libhdf5-110_fortran.so.102 >-%%FORTRAN%%lib/libhdf5-110_fortran.so.102.1.3 >+%%FORTRAN%%lib/libhdf5-110_fortran.so.102.1.4 > lib/libhdf5-110_hl.a > lib/libhdf5-110_hl.so > lib/libhdf5-110_hl.so.100 >-lib/libhdf5-110_hl.so.100.1.7 >+lib/libhdf5-110_hl.so.100.1.8 > %%CXX%%lib/libhdf5-110_hl_cpp.a > %%CXX%%lib/libhdf5-110_hl_cpp.so > %%CXX%%lib/libhdf5-110_hl_cpp.so.100 >-%%CXX%%lib/libhdf5-110_hl_cpp.so.100.1.8 >+%%CXX%%lib/libhdf5-110_hl_cpp.so.100.1.9 > %%FORTRAN%%lib/libhdf5-110_hl_fortran.a > %%FORTRAN%%lib/libhdf5-110_hl_fortran.so > %%FORTRAN%%lib/libhdf5-110hl_fortran.a > %%FORTRAN%%lib/libhdf5-110hl_fortran.so > %%FORTRAN%%lib/libhdf5-110hl_fortran.so.100 >-%%FORTRAN%%lib/libhdf5-110hl_fortran.so.100.0.9 >+%%FORTRAN%%lib/libhdf5-110hl_fortran.so.100.0.10 > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/chunks.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/compound.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/create.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/extend_ds.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5group.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_cmprss.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtatt.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtdat.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrp.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrpar.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrpd.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_extend.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_rdwt.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_subset.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/readdata.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/run-c++-ex.sh >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/writedata.cpp > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_attribute.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_chunk_read.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_cmprss.c >@@ -189,8 +173,8 @@ lib/libhdf5-110_hl.so.100.1.7 > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_debug_trace.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_drivers.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_elink_unix2win.c >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extend.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extend_write.c >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extend.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extlink.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_group.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_mount.c >@@ -210,13 +194,30 @@ lib/libhdf5-110_hl.so.100.1.7 > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_vds-simpleIO.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_vds.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_write.c >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5_filtered_writes.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5_filtered_writes_no_sel.c >+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5_filtered_writes.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5example.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/run-c-ex.sh >-%%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/compound.f90 >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/chunks.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/compound.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/create.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/extend_ds.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5group.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_cmprss.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtatt.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtdat.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrp.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrpar.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrpd.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_extend.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_rdwt.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_subset.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/readdata.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/run-c++-ex.sh >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/writedata.cpp > %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/compound_complex_fortran2003.f90 > %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/compound_fortran2003.f90 >+%%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/compound.f90 > %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_cmprss.f90 > %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_crtatt.f90 > %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_crtdat.f90 >@@ -235,8 +236,9 @@ lib/libhdf5-110_hl.so.100.1.7 > %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/run-fortran-ex.sh > %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/rwdset_fortran2003.f90 > %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/selectele.f90 >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/ptExampleFL.cpp >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/run-hlc++-ex.sh >+%%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/ex_ds1.f90 >+%%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/exlite.f90 >+%%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/run-hlfortran-ex.sh > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_ds1.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_image1.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_image2.c >@@ -260,8 +262,7 @@ lib/libhdf5-110_hl.so.100.1.7 > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/pal_rgb.h > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ptExampleFL.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/run-hlc-ex.sh >-%%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/ex_ds1.f90 >-%%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/exlite.f90 >-%%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/run-hlfortran-ex.sh >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/ptExampleFL.cpp >+%%CXX%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/run-hlc++-ex.sh > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/run-hl-ex.sh > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-all-ex.sh >-- >2.45.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 279183
:
250834
|
251169