1 --- med-4.1.0_ref/configure 2020-03-11 12:53:46.000000000 +0100
2 +++ med-4.1.0_dev/configure 2023-03-01 14:45:28.321320038 +0100
5 HDF_VERSION_REF=5-1.10.2
6 HDF_VERSION_MAJOR_REF=1
7 -HDF_VERSION_MINOR_REF=10
8 +HDF_VERSION_MINOR_REF=13
9 HDF_VERSION_RELEASE_REF=2
12 @@ -7573,16 +7573,16 @@
14 if test -n "$HDF5_ABS_PATH" ; then
15 HDF5_USED_VER=` grep H5_VERS_INFO $HDF5_ABS_PATH | sed 's/\([^"]*\)\(".*"\)\([^"]*\)/\2/g' `
16 - H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
17 - H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
18 - H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
19 + H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | cut -d ' ' -f3 `
20 + H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | cut -d ' ' -f3 `
21 + H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | cut -d ' ' -f3 `
22 HDF5_VERSION=` expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
23 - test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
24 -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}.
25 -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}.
26 -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.
27 -This would BREAK med-fichier compatibility between files with the same revision number !
29 +# test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
30 +# 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}.
31 +# 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}.
32 +# 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.
33 +# This would BREAK med-fichier compatibility between files with the same revision number !
36 ## In case user explicitly ask to not use hdf5 !
37 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't compile MED without hdf5" >&5
38 @@ -31697,7 +31697,8 @@
39 case $am_cv_python_pythondir in
41 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
42 - am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
43 + # am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
44 + am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
48 @@ -31741,7 +31742,8 @@
49 case $am_cv_python_pyexecdir in
51 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
52 - am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
53 + # am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
54 + am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
57 case $am_py_exec_prefix in
58 --- med-4.1.0_ref/src/hdfi/_MEDparFileCreate.c 2020-03-11 10:36:37.000000000 +0100
59 +++ med-4.1.0_dev/src/hdfi/_MEDparFileCreate.c 2023-03-01 14:38:44.653666031 +0100
61 * En HDF5-1.10.0p1 cela n'a aucun effet !
62 * Un test autoconf permet de fixer un intervalle de version HDF à MED.
64 -#if H5_VERS_MINOR > 10
65 +#if H5_VERS_MINOR > 12
66 #error "Don't forget to change the compatibility version of the library !"
69 --- med-4.1.0_ref/src/hdfi/_MEDmemFileOpen.c 2020-03-11 11:06:04.000000000 +0100
70 +++ med-4.1.0_dev/src/hdfi/_MEDmemFileOpen.c 2023-03-01 14:39:16.990279182 +0100
75 -#if H5_VERS_MINOR > 10
76 +#if H5_VERS_MINOR > 12
77 #error "Don't forget to change the compatibility version of the library !"
79 if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
80 --- med-4.1.0_ref/src/hdfi/_MEDfileCreate.c 2020-03-11 10:36:37.000000000 +0100
81 +++ med-4.1.0_dev/src/hdfi/_MEDfileCreate.c 2023-03-01 14:42:38.690103638 +0100
83 * En HDF5-1.10.0p1 cela n'a aucun effet !
84 * Un test autoconf permet de fixer un intervalle de version HDF à MED.
86 -#if H5_VERS_MINOR > 10
87 +#if H5_VERS_MINOR > 12
88 #error "Don't forget to change the compatibility version of the library !"
91 --- med-4.1.0_ref/src/hdfi/_MEDparFileOpen.c 2020-03-11 10:36:36.000000000 +0100
92 +++ med-4.1.0_dev/src/hdfi/_MEDparFileOpen.c 2023-03-01 14:43:12.134737789 +0100
94 MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
97 -#if H5_VERS_MINOR > 10
98 +#if H5_VERS_MINOR > 12
99 #error "Don't forget to change the compatibility version of the library !"
101 if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
102 --- med-4.1.0_ref/src/hdfi/_MEDfileOpen.c 2020-03-12 16:27:49.000000000 +0100
103 +++ med-4.1.0_dev/src/hdfi/_MEDfileOpen.c 2023-03-01 14:43:45.131363443 +0100
106 • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
108 -#if H5_VERS_MINOR > 10
109 +#if H5_VERS_MINOR > 12
110 #error "Don't forget to change the compatibility version of the library !"
112 /* L'avantage de bloquer le modèle interne HDF5
113 --- med-4.1.0_ref/src/ci/MEDfileCompatibility.c 2020-03-11 10:36:34.000000000 +0100
114 +++ med-4.1.0_dev/src/ci/MEDfileCompatibility.c 2023-03-01 14:38:09.220994176 +0100
116 #if MED_NUM_MAJEUR != 4
117 #error "Don't forget to update the test version here when you change the major version of the library !"
119 -#if H5_VERS_MINOR > 10
120 +#if H5_VERS_MINOR > 12
121 #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
122 #error "Cf. _MEDfileCreate ..."