From 1d18b53ed419c49eb3f71637ccd58a431c1368d4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Apr 2023 05:44:50 +0100 Subject: gentoo auto-resync : 14:04:2023 - 05:44:49 --- sci-libs/hdf5/Manifest | 3 +- .../hdf5/files/hdf5-1.12.2-configure-clang16.patch | 30 ++++++ sci-libs/hdf5/hdf5-1.12.2-r5.ebuild | 118 -------------------- sci-libs/hdf5/hdf5-1.12.2-r6.ebuild | 119 +++++++++++++++++++++ 4 files changed, 151 insertions(+), 119 deletions(-) create mode 100644 sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch delete mode 100644 sci-libs/hdf5/hdf5-1.12.2-r5.ebuild create mode 100644 sci-libs/hdf5/hdf5-1.12.2-r6.ebuild (limited to 'sci-libs/hdf5') diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest index 0ce519a7ef07..0ea9c8d4c6ac 100644 --- a/sci-libs/hdf5/Manifest +++ b/sci-libs/hdf5/Manifest @@ -1,3 +1,4 @@ +AUX hdf5-1.12.2-configure-clang16.patch 1239 BLAKE2B 76641263e8cdf1f694a0b23c9787e9c1a0e86e30079507beb25caf2c1b89a2e431f7456321e89a39a6ec1d06c5a51a941f9ae5c85a7e3e24462c0eabd41911e3 SHA512 b664f6e464ec824bad46a8e58b571a46b10bcdcc8eae39b878d239b169685b2d1bba6c0ce295f8a690b94f016731176f500b568ef9f0cd2fe0df290ffb6dc298 AUX hdf5-1.12.2-no-messing-ldpath.patch 1086 BLAKE2B 77aba02cd8f3663883fa5cf91b3f77067163f58ec4270d22e2c4e1a5b9b1cc138a2e9dd1c7a44331165c69d6c7a0427fe2708bae63958b416a9f26c799de7443 SHA512 8b8aa080cb6feded376900cf9f4b1f1bbe98550b37e9ae8ad660419f732e686aae2ff6eac37e7810ee438a0e9c1b7a37d24f5db8590cce0c91f482ec7b873527 AUX hdf5-1.12.2-no-strip-symbols.patch 434 BLAKE2B c8d96cb95d3444c18349d72b7fd59f76b4af3d0c5422a7c31161b8f98afacb322b042b8f5751b581565b351148fd0f4003379349b6ca964f5957cd9e19ebdebc SHA512 6b593a8bbbd4a4e9b97e8b3324ad90024b2c09c669d2f6e21a0d23adb66bbbec34afc5961bf97bc6f913492e33610a4b5aeca6a7a4ef9f7605ce5b69fbba6527 AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8c3c4da0c373f88b3fdf21e1f89b169b747d49572239385228687cfc10380bdceb9ca6d1ac0d5f5154cb7a328f8a2d509fb28d SHA512 e43021ceb83909ab06ba378363c192aa0f1b34cc7c2b121f5000e215516dbdea1b825a53ac4023073bf4870a5c3452c22f5535391d95af45ad63a309e1ffa5a4 @@ -7,5 +8,5 @@ DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2a DIST hdf5-1.12.2.tar.bz2 10494264 BLAKE2B 99ca5b57f6f54fa044c909f0773de62b218c1f0ec3c011f88f3c227536dd719e77ddbe42d562b1214e8843e41d8fc56db499d7f122876fdd36ef31b235229cb7 SHA512 cbb4663570de76b11adb6bf62cfdb754371d31eeab04691479a5764a45207a9c1309665ab80f51c63a4b9b87354f9cbe6835cef506a9fd554d142c6d2bec21e5 EBUILD hdf5-1.10.5-r1.ebuild 2940 BLAKE2B 45e4cf6004cb70667829844ddf37f2c4f96d6b5c92a8eb9b3c757ea47e6d9f98e28f906c7d2c6a33efd95328bc0b6358d640da36c82fc5408bbb968c38b95115 SHA512 04ac047f56128f41f4cdc8b07caa0d656f31d34200961a1ee525583263dc338abff7860158f9549ddf31bf0563ed963fbd5dff4ee212d85443aff599e5d2c25a EBUILD hdf5-1.12.2-r4.ebuild 3209 BLAKE2B eb7b30bee62cbad778b07f089026395d70046e3845b636bdb526e0960e4ae3789f2e5d1c9eac6fc213b755809c42946cf332446582d032d04900cfd80b57b06a SHA512 e6c2c24f9558c381b8ae5da8f0967635c64b02ad5f8288d5a08841c7637f8de7b72229f89d8be2cff5cd0c8c4482b404db3a7d41aeeaa927157c257f91fb62a3 -EBUILD hdf5-1.12.2-r5.ebuild 3289 BLAKE2B e005475b0d746974ce117f5d590365931560aaa7e76b9c674716fef0b63a982a24116aaf4d29cb0d1a83d7cf5651b55b2531e42587af92b50fde50caf63f1616 SHA512 3bdf59a729c560da5896b3c486306579aa1822b066cb5ffaa635a5e3b3934d76e96a2af5afbb9752de623389d78a5c10df19c050922bd82a7c20605bd8a2dae9 +EBUILD hdf5-1.12.2-r6.ebuild 3341 BLAKE2B c574efa933f240fae23049007c320138ea43354ddd78194d74e6b27f630a6ad0fa2a1bc083b563006eb7dd7e36ee00a77a6f684ad42bee383372a79750726d9a SHA512 0385774ab2be1abeec7467886f8900b514d8c1410c531dac7753570cb9e47d35750cd8ddfe92a0df524ecae8889602cc27caa15a52d8e94aa10455e50cf18df3 MISC metadata.xml 826 BLAKE2B fd131bb207e4ab863ef7c05ab95e5c0254fa08230139a2508ab5f0c363809b0735532498ad26cc39621495a063de86ab5bd97447514ff561a63302e8b1d7d26d SHA512 290883ed9bf3de60bf04e2474c4db50e095b1b87974867e58601a5c5c2f98d6b839ed22d9ce2798bc44f484f1a38ee4b6df99aaea7d134629bd441d34b5a29b5 diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch b/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch new file mode 100644 index 000000000000..f341fa99ddac --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.12.2-configure-clang16.patch @@ -0,0 +1,30 @@ +https://github.com/HDFGroup/hdf5/commit/9dd36f016a4316b94f5df15856d228de01d304c6 + +From 9dd36f016a4316b94f5df15856d228de01d304c6 Mon Sep 17 00:00:00 2001 +From: Ryan Schmidt +Date: Thu, 17 Nov 2022 16:28:44 -0600 +Subject: [PATCH] Simplify & fix check for szlib encoder (#2263) + +Return the result rather than setting the exit code. "return" is a +language keyword whereas "exit" is a function for which the +header has to be included which it wasn't in this test, therefore the +test would previously fail to identify that the encoder was enabled if +"-Werror=implicit-function-declaration" was used, which it is by default +with clang from Xcode 12 and later. + +Fixes #2262 +--- a/configure.ac ++++ b/configure.ac +@@ -1737,10 +1737,7 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then + #include "szlib.h" + ],[[ + /* SZ_encoder_enabled returns 1 if encoder is present */ +- if(SZ_encoder_enabled() == 1) +- exit(0); +- else +- exit(1); ++ return SZ_encoder_enabled() != 1; + ]])] + , [hdf5_cv_szlib_can_encode=yes], [hdf5_cv_szlib_can_encode=no],)] + ) + diff --git a/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild deleted file mode 100644 index c27c86b3a6eb..000000000000 --- a/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran - -# We've reverted *back* to autotools from CMake because of -# https://github.com/HDFGroup/hdf5/issues/1814. -inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix - -MY_P=${PN}-${PV/_p/-patch} -MAJOR_P=${PN}-$(ver_cut 1-2) - -DESCRIPTION="General purpose library and file format for storing scientific data" -HOMEPAGE="https://www.hdfgroup.org/HDF5/" -SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="NCSA-HDF" -SLOT="0/${PV%%_p*}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib" -REQUIRED_USE=" - !unsupported? ( - cxx? ( !mpi ) mpi? ( !cxx ) - threads? ( !cxx !mpi !fortran !hl ) - ) -" - -RDEPEND=" - mpi? ( virtual/mpi[romio] ) - szip? ( virtual/szip ) - zlib? ( sys-libs/zlib:0= )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch - "${FILESDIR}"/${PN}-1.12.2-no-messing-ldpath.patch - "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch -) - -pkg_setup() { - # Workaround for bug 285148 - tc-export CXX CC AR - - use fortran && fortran-2_pkg_setup - - if use mpi; then - if has_version 'sci-libs/hdf5[-mpi]'; then - ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." - ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." - fi - - export CC=mpicc - use fortran && export FC=mpif90 - elif has_version 'sci-libs/hdf5[mpi]'; then - ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." - ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." - fi -} - -src_prepare() { - default - - # Respect Gentoo examples directory - sed \ - -e "s:hdf5_examples:doc/${PF}/examples:g" \ - -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die - sed \ - -e '/docdir/d' \ - -i config/commence.am || die - - if ! use examples; then - # bug #409091 - sed -e '/^install:/ s/install-examples//' \ - -i Makefile.am || die - fi - - # Enable shared libs by default for h5cc config utility - sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die - hprefixify m4/libtool.m4 - - eautoreconf -} - -src_configure() { - # bug #686620 - use sparc && tc-is-gcc && append-flags -fno-tree-ccp - - econf \ - --disable-static \ - --enable-deprecated-symbols \ - --enable-build-mode=$(usex debug debug production) \ - --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" \ - $(use_enable cxx) \ - $(use_enable debug codestack) \ - $(use_enable fortran) \ - $(use_enable hl) \ - $(use_enable mpi parallel) \ - $(use_enable threads threadsafe) \ - $(use_enable unsupported) \ - $(use_with szip szlib) \ - $(use_with threads pthread) \ - $(use_with zlib) -} - -src_install() { - emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install - - # No static archives - find "${ED}" -name '*.la' -delete || die - - # Remove "perf" executable due to file collisions with dev-util/perf. - # Previously with the CMake build system we only installed h5perf, so - # let's simply remove the file for now. - use mpi && { rm "${ED}"/usr/bin/perf || die "rm failed" ; } -} diff --git a/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild new file mode 100644 index 000000000000..c723c3ad3dde --- /dev/null +++ b/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +# We've reverted *back* to autotools from CMake because of +# https://github.com/HDFGroup/hdf5/issues/1814. +inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix + +MY_P=${PN}-${PV/_p/-patch} +MAJOR_P=${PN}-$(ver_cut 1-2) + +DESCRIPTION="General purpose library and file format for storing scientific data" +HOMEPAGE="https://www.hdfgroup.org/HDF5/" +SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="NCSA-HDF" +SLOT="0/${PV%%_p*}" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib" +REQUIRED_USE=" + !unsupported? ( + cxx? ( !mpi ) mpi? ( !cxx ) + threads? ( !cxx !mpi !fortran !hl ) + ) +" + +RDEPEND=" + mpi? ( virtual/mpi[romio] ) + szip? ( virtual/szip ) + zlib? ( sys-libs/zlib:0= )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch + "${FILESDIR}"/${PN}-1.12.2-no-messing-ldpath.patch + "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch + "${FILESDIR}"/${PN}-1.12.2-configure-clang16.patch +) + +pkg_setup() { + # Workaround for bug 285148 + tc-export CXX CC AR + + use fortran && fortran-2_pkg_setup + + if use mpi; then + if has_version 'sci-libs/hdf5[-mpi]'; then + ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." + ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." + fi + + export CC=mpicc + use fortran && export FC=mpif90 + elif has_version 'sci-libs/hdf5[mpi]'; then + ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." + ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." + fi +} + +src_prepare() { + default + + # Respect Gentoo examples directory + sed \ + -e "s:hdf5_examples:doc/${PF}/examples:g" \ + -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die + sed \ + -e '/docdir/d' \ + -i config/commence.am || die + + if ! use examples; then + # bug #409091 + sed -e '/^install:/ s/install-examples//' \ + -i Makefile.am || die + fi + + # Enable shared libs by default for h5cc config utility + sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die + hprefixify m4/libtool.m4 + + eautoreconf +} + +src_configure() { + # bug #686620 + use sparc && tc-is-gcc && append-flags -fno-tree-ccp + + econf \ + --disable-static \ + --enable-deprecated-symbols \ + --enable-build-mode=$(usex debug debug production) \ + --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" \ + $(use_enable cxx) \ + $(use_enable debug codestack) \ + $(use_enable fortran) \ + $(use_enable hl) \ + $(use_enable mpi parallel) \ + $(use_enable threads threadsafe) \ + $(use_enable unsupported) \ + $(use_with szip szlib) \ + $(use_with threads pthread) \ + $(use_with zlib) +} + +src_install() { + emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install + + # No static archives + find "${ED}" -name '*.la' -delete || die + + # Remove "perf" executable due to file collisions with dev-util/perf. + # Previously with the CMake build system we only installed h5perf, so + # let's simply remove the file for now. + use mpi && { rm "${ED}"/usr/bin/perf || die "rm failed" ; } +} -- cgit v1.2.3