Attachment 221446 Details for Bug 252565 – Switch to hdf5-110 if PR 251894 gets committed

[patch] Switch to hdf5-110 if PR 251894 gets committed

french_med.diff (text/plain), 6.58 KB, created by Thierry Thomas on 2021-01-10 21:51:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2021-01-10 21:51:37 UTC

Size: 6.58 KB

patch

obsolete

>Index: french/med/Makefile
>===================================================================
>--- french/med/Makefile	(revision 559838)
>+++ french/med/Makefile	(working copy)
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	med
>-DISTVERSION=	4.0.0
>+PORTVERSION=	4.0.0
>+PORTREVISION=	1
> CATEGORIES=	french science
> 
> MAINTAINER=	thierry@FreeBSD.org
>@@ -11,7 +12,7 @@
> LICENSE=	GPLv3
> 
> BUILD_DEPENDS=	gsed:textproc/gsed
>-LIB_DEPENDS=	libhdf5.so:science/hdf5
>+LIB_DEPENDS=	libhdf5-110.so:science/hdf5-110
> 
> USES=		fortran gmake libtool tk
> 
>@@ -19,7 +20,8 @@
> 
> USE_CXXSTD=	gnu++98
> CFLAGS+=	-fPIC
>-CONFIGURE_ARGS=	--disable-python --with-hdf5=${LOCALBASE}
>+CONFIGURE_ARGS=	--disable-python --with-hdf5=${LOCALBASE}	\
>+		--with-hdf5-include=${LOCALBASE}/include/hdf5-110
> CONFIGURE_ENV=	WISH=${WISH}
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>Index: french/med/files/patch-configure
>===================================================================
>--- french/med/files/patch-configure	(revision 559838)
>+++ french/med/files/patch-configure	(working copy)
>@@ -1,19 +1,6 @@
> --- configure.orig	2018-12-10 10:32:28 UTC
> +++ configure
>-@@ -3194,10 +3194,10 @@ MEDIMPORT_CMAKE_SO_VERSION="0.3.0"
>- #Une modification de HDF_VERSION_NUM
>- #demande une modification du test de version ds
>- #med_check_hdf5.m4
>--HDF_VERSION_REF=5-1.10.2
>-+HDF_VERSION_REF=5-1.10.5
>- HDF_VERSION_MAJOR_REF=1
>- HDF_VERSION_MINOR_REF=10
>--HDF_VERSION_RELEASE_REF=2
>-+HDF_VERSION_RELEASE_REF=5
>- 
>- 
>- 
>-@@ -7572,9 +7572,9 @@ _ACEOF
>+@@ -7572,11 +7572,11 @@ _ACEOF
>        HDF5_VERSION="0"
>        if test -n "$HDF5_ABS_PATH" ; then
>           HDF5_USED_VER=` grep H5_VERS_INFO $HDF5_ABS_PATH | sed  's/$[^"]*$$".*"$$[^"]*$/\2/g' `
>@@ -24,5 +11,74 @@
> +         H5_VER_MINOR=`  grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | gsed  's/^.*H5_VERS_MINOR[[ \t]]*$[0-9]*$[[ \t]]*.*$/\1/g' `
> +         H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | gsed  's/^.*H5_VERS_RELEASE[[ \t]]*$[0-9]*$[[ \t]]*.*$/\1/g' `
>           HDF5_VERSION=`  expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
>-          test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
>+-         test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
>++         test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11006" && as_fn_error $? "
>  This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}.
>+ The HDF5 library version used by med-fichier${MED_NUM_MAJEUR}.y.z MUST NOT be > 1.10 and have to be at least HDF${HDF_VERSION_REF}.
>+ DO NOT TRY TO COMPILE med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE} version with an HDF5 library which would generate an hdf5 file not compliant with HDF5-${HDF_VERSION_MAJOR_REF}.${HDF_VERSION_MINOR_REF}.z library.
>+@@ -7633,13 +7633,13 @@ _ACEOF
>+ 
>+ #      AC_CHECK_LIB([m],[sin],[],[AC_MSG_ERROR([Can't find C math library.])],[])
>+ #      AC_CHECK_LIB([z],[compress],[],[AC_MSG_ERROR([Can't find z library.])],[])
>+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5open in -lhdf5" >&5
>+-$as_echo_n "checking for H5open in -lhdf5... " >&6; }
>++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5open in -lhdf5-110" >&5
>++$as_echo_n "checking for H5open in -lhdf5-110... " >&6; }
>+ if ${ac_cv_lib_hdf5_H5open+:} false; then :
>+   $as_echo_n "(cached) " >&6
>+ else
>+   ac_check_lib_save_LIBS=$LIBS
>+-LIBS="-lhdf5 -lm -lz $LIBS"
>++LIBS="-lhdf5-110 -lm -lz $LIBS"
>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>+ /* end confdefs.h.  */
>+ 
>+@@ -7674,10 +7674,10 @@ if test "x$ac_cv_lib_hdf5_H5open" = xyes; then :
>+ #define HAVE_LIBHDF5 1
>+ _ACEOF
>+ 
>+-  LIBS="-lhdf5 $LIBS"
>++  LIBS="-lhdf5-110 $LIBS"
>+ 
>+ else
>+-  as_fn_error $? "Can't find hdf5 library, either use HDF5HOME env. var. , --with-hdf5=<path> or --with-hdf5-lib=<libpath>" "$LINENO" 5
>++  as_fn_error $? "Can't find hdf5-110 library, either use HDF5HOME env. var. , --with-hdf5=<path> or --with-hdf5-lib=<libpath>" "$LINENO" 5
>+ fi
>+ 
>+       test "x$mpi_wanted_test" = "xyes" &&  for ac_func in H5Pset_fapl_mpio
>+@@ -7696,7 +7696,7 @@ done
>+ 
>+       if test "x$with_hdf5_include" = "xno"; then
>+         # Extract the first word of "h5dump", so it can be a program name with args.
>+-set dummy h5dump; ac_word=$2
>++set dummy h5dump-110; ac_word=$2
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
>+ $as_echo_n "checking for $ac_word... " >&6; }
>+ if ${ac_cv_path_H5DUMP+:} false; then :
>+@@ -7738,7 +7738,7 @@ fi
>+ 
>+       else
>+         # Extract the first word of "h5dump", so it can be a program name with args.
>+-set dummy h5dump; ac_word=$2
>++set dummy h5dump-110; ac_word=$2
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
>+ $as_echo_n "checking for $ac_word... " >&6; }
>+ if ${ac_cv_path_H5DUMP+:} false; then :
>+@@ -7780,7 +7780,7 @@ fi
>+ 
>+       fi
>+       if test "X$H5DUMP" = "Xno"; then
>+-         as_fn_error $? "Can't find h5dump, please verify your env. var. PATH or use of --with-hdf5bin=<binpath>." "$LINENO" 5
>++         as_fn_error $? "Can't find h5dump-110, please verify your env. var. PATH or use of --with-hdf5bin=<binpath>." "$LINENO" 5
>+       fi
>+ 
>+ 
>+@@ -7797,7 +7797,7 @@ fi
>+ #La ligne suivante est inutile car effectuÃ©e par AC_CHECK_PROG
>+ #      AC_SUBST(H5DUMP)
>+ 
>+-      HDF5_LIBS="-lhdf5"
>++      HDF5_LIBS="-lhdf5-110"
>+ 
>+ 
>+ 
>Index: french/med/files/patch-include_med.h.in
>===================================================================
>--- french/med/files/patch-include_med.h.in	(revision 559838)
>+++ french/med/files/patch-include_med.h.in	(nonexistent)
>@@ -1,15 +0,0 @@
>---- include/med.h.in.orig	2014-10-09 08:12:57 UTC
>-+++ include/med.h.in
>-@@ -27,12 +27,7 @@ extern "C" {
>- 
>- #define HDF5_VERSION (H5_VERS_MAJOR * 10000 + H5_VERS_MINOR * 100  + H5_VERS_RELEASE )
>- 
>--#if HDF5_VERSION < 10607
>--/*TODO : A enlever aprÃ¨s MAJ complÃ¨te api hdf5-1.8 */
>--#define HDF5_SELECT_BUG (const hsize_t **)
>--#else
>- #define HDF5_SELECT_BUG
>--#endif
>- 
>- /*Le symbole H5F_LIBVER_18 n'existe pas dans hdf5-1.8.4 (uniquement Ã  partir de la version 1.8.6)
>-   Pour rester dans le modÃ¨le interne hdf introduit en 1.8 quelque soit les futurs modÃ¨les internes hdf
>
>Property changes on: french/med/files/patch-include_med.h.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 252565: 221446