From b1c81de4fadbd00897700a7321f03b390d952b2e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 26 Aug 2021 00:09:36 +0100 Subject: gentoo resync : 26.08.2021 --- sci-libs/med/Manifest | 3 +- .../med-4.1.0-0003-build-against-hdf5-1.12.patch | 117 +++++++++++++++++++++ sci-libs/med/med-4.1.0.ebuild | 6 +- 3 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch (limited to 'sci-libs/med') diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest index 00d5b0182d75..2a389a8cbb24 100644 --- a/sci-libs/med/Manifest +++ b/sci-libs/med/Manifest @@ -1,5 +1,6 @@ AUX med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch 1412 BLAKE2B 50602ca4a76ba4d15072d6bb96f9ce8576ac819c36b2a2a30268b506e1f453966e2846ea81ab8919d59c47e5f2ca41bc433b9fddee13797834f3a0c11a8fbb0f SHA512 cf810b8f8f2466d0b2bbf6fae1167faf57ce0b01812630ab165401432fee474b6ce80b50e122c36c61f0c347f89a1975cb91ac7ea3939eee2c15bf9e1a1dcdbe AUX med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch 1061 BLAKE2B 1856be8c2189e5d7541f041182e48315d686cadfeb409872eee25a90ff657cf1b6a5c76a4632a6d3d12af29b2f7ee67201d67c40cbc98927702ce1c905aa2509 SHA512 c40235bed175f84615115c899fad9f78a03205a7192bdf68f1b79a1711a7a15c58145102fce9850898f463d6d7ad16bbb89416f689d4013364955036628e7263 +AUX med-4.1.0-0003-build-against-hdf5-1.12.patch 4749 BLAKE2B 3a606c27bce6130e83989dd4e16733ced50da0ef21dd40226ffb6f64abbd5f2eca2174f971b4bbf3204df0e6040b86706c007dbf6b821a5bb287b648078d9113 SHA512 ba2fa24e3aeb2be6fa1e7365d7ac57c9ebd8706dd19de7dba67507baafe1f48b7b00051169f27164b4a9e749816220619490d5f0796a0c02f25644569b26f366 DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8 -EBUILD med-4.1.0.ebuild 3231 BLAKE2B 336bfbfba073d30dd9ef1efb0b00ef5cdc90f53ab3de07002219f3750d433c8aabccdd02c439ef262058cfc3ce9676562e808863ce09af741671b2a107953c73 SHA512 d45cc92458137499e6f735fb4f440d5f823710dd0167c71302dbdea59e0d1938e009fe25d23d60f0aef9eb5df785f9288ea6faedcf30f65c31cda71aa65294c1 +EBUILD med-4.1.0.ebuild 3342 BLAKE2B fde2ce1741442e953a4d141a58b71226cf9e209d7b2941cbb859144dffcf3895740a1aa3b664738b6d0f34a6d450ea2a6f4c87258af557324c21daa694ce1c23 SHA512 8db224906fee79e35308b0445e450e239d34f73717370da0db6bfeb22084b5a99fc4b8fbd6c11fc1cb49352d088aaf74752a8e9b304a63286330d2b9491ee95c MISC metadata.xml 635 BLAKE2B 679b3111d148b77df38d08e07223c25390b3e0dbff3661fc1ff88084556979db955b990c9998f84dbc9782773728e73d22c28e534d45a33857d72f36585a7c30 SHA512 f19b5ade75301ed6985a00bbd5e074523bce2601dc992e27a472be17e958f45db4549cb6f88946862204840c2c70bb06e64683716157051769a785763d571908 diff --git a/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch new file mode 100644 index 000000000000..46d7ed21af8d --- /dev/null +++ b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch @@ -0,0 +1,117 @@ +From 5c9c1ce9911290283d39e16b1ed4c1d4ea5a5678 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Tue, 24 Aug 2021 08:32:13 +0200 +Subject: [PATCH] build against hdf5-1.12 + +Signed-off-by: Bernd Waibel +--- + config/cmake_files/medMacros.cmake | 4 ++-- + src/ci/MEDfileCompatibility.c | 2 +- + src/hdfi/_MEDfileCreate.c | 2 +- + src/hdfi/_MEDfileOpen.c | 2 +- + src/hdfi/_MEDmemFileOpen.c | 2 +- + src/hdfi/_MEDparFileCreate.c | 2 +- + src/hdfi/_MEDparFileOpen.c | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake +index 957c59b..d73c7af 100644 +--- a/config/cmake_files/medMacros.cmake ++++ b/config/cmake_files/medMacros.cmake +@@ -447,13 +447,13 @@ MACRO(MED_FIND_HDF5) + ## + ## Requires 1.10.x version + ## +- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) ++ IF(HDF5_VERSION VERSION_LESS 1.10.2) + MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") + ENDIF() + ## + ## + +- ADD_DEFINITIONS(-DH5_USE_16_API) ++ ADD_DEFINITIONS(-DH5_USE_18_API -DH5_USE_16_API) + IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1) + ENDIF() +diff --git a/src/ci/MEDfileCompatibility.c b/src/ci/MEDfileCompatibility.c +index 1d6cabf..43b5b50 100644 +--- a/src/ci/MEDfileCompatibility.c ++++ b/src/ci/MEDfileCompatibility.c +@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename, + #if MED_NUM_MAJEUR != 4 + #error "Don't forget to update the test version here when you change the major version of the library !" + #endif +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" + #error "Cf. _MEDfileCreate ..." + #endif +diff --git a/src/hdfi/_MEDfileCreate.c b/src/hdfi/_MEDfileCreate.c +index 4bc9551..b670c92 100644 +--- a/src/hdfi/_MEDfileCreate.c ++++ b/src/hdfi/_MEDfileCreate.c +@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access + * En HDF5-1.10.0p1 cela n'a aucun effet ! + * Un test autoconf permet de fixer un intervalle de version HDF à MED. + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + +diff --git a/src/hdfi/_MEDfileOpen.c b/src/hdfi/_MEDfileOpen.c +index 8ace00e..ebd875b 100644 +--- a/src/hdfi/_MEDfileOpen.c ++++ b/src/hdfi/_MEDfileOpen.c +@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod + + • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + /* L'avantage de bloquer le modèle interne HDF5 +diff --git a/src/hdfi/_MEDmemFileOpen.c b/src/hdfi/_MEDmemFileOpen.c +index ae92ba7..4a929ff 100644 +--- a/src/hdfi/_MEDmemFileOpen.c ++++ b/src/hdfi/_MEDmemFileOpen.c +@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile + goto ERROR; + } + +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { +diff --git a/src/hdfi/_MEDparFileCreate.c b/src/hdfi/_MEDparFileCreate.c +index f0b77be..b7d1b78 100644 +--- a/src/hdfi/_MEDparFileCreate.c ++++ b/src/hdfi/_MEDparFileCreate.c +@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc + * En HDF5-1.10.0p1 cela n'a aucun effet ! + * Un test autoconf permet de fixer un intervalle de version HDF à MED. + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + +diff --git a/src/hdfi/_MEDparFileOpen.c b/src/hdfi/_MEDparFileOpen.c +index 0a9700d..4933692 100644 +--- a/src/hdfi/_MEDparFileOpen.c ++++ b/src/hdfi/_MEDparFileOpen.c +@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access + MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG); + goto ERROR; + } +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { +-- +2.32.0 + diff --git a/sci-libs/med/med-4.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild index ab5056e4a4d7..ec6eef42dc1e 100644 --- a/sci-libs/med/med-4.1.0.ebuild +++ b/sci-libs/med/med-4.1.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 FORTRAN_NEEDED=fortran -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake fortran-2 python-single-r1 @@ -30,9 +30,11 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" +# "${FILESDIR}/${P}-0003-fix-hdf5-version-check.patch" PATCHES=( "${FILESDIR}/${P}-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" "${FILESDIR}/${P}-0002-Re-add-option-for-building-Fortran-library.patch" + "${FILESDIR}/${P}-0003-build-against-hdf5-1.12.patch" ) DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO ) -- cgit v1.2.3