From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BF2BB1580B9 for ; Wed, 25 Aug 2021 06:18:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11822E0817; Wed, 25 Aug 2021 06:18:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB395E0817 for ; Wed, 25 Aug 2021 06:18:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6E04335DC4 for ; Wed, 25 Aug 2021 06:17:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4633E8D1 for ; Wed, 25 Aug 2021 06:17:58 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1629872004.350ea3e89d0e87e35a3a4b5f2ce92b55aae9d226.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/med/, sci-libs/med/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch sci-libs/med/med-4.1.0.ebuild X-VCS-Directories: sci-libs/med/ sci-libs/med/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 350ea3e89d0e87e35a3a4b5f2ce92b55aae9d226 X-VCS-Branch: master Date: Wed, 25 Aug 2021 06:17:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b77d80c-826d-40a4-b7f0-1ba3d3389e02 X-Archives-Hash: c56bd385923d8a20f0011e2b7f5fa30e commit: 350ea3e89d0e87e35a3a4b5f2ce92b55aae9d226 Author: Bernd Waibel posteo net> AuthorDate: Tue Aug 24 15:45:11 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Aug 25 06:13:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=350ea3e8 sci-libs/med: fix build against hdf5-1.12 Thanks to Alexandre Ferreira for providing the patch. Closes: https://bugs.gentoo.org/809008 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/22096 Signed-off-by: Andrew Ammerlaan gentoo.org> .../med-4.1.0-0003-build-against-hdf5-1.12.patch | 117 +++++++++++++++++++++ sci-libs/med/med-4.1.0.ebuild | 6 +- 2 files changed, 121 insertions(+), 2 deletions(-) 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 00000000000..46d7ed21af8 --- /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 ab5056e4a4d..ec6eef42dc1 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 )