* [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/files/, sci-libs/hdf5/
@ 2023-04-14 3:39 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-04-14 3:39 UTC (permalink / raw
To: gentoo-commits
commit: 8763b1b03668dc7b0a681225b55552013f216f4c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 03:13:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 03:23:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8763b1b0
sci-libs/hdf5: fix configure w/ clang 16
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../hdf5/files/hdf5-1.12.2-configure-clang16.patch | 30 ++++++++++++++++++++++
...hdf5-1.12.2-r5.ebuild => hdf5-1.12.2-r6.ebuild} | 1 +
2 files changed, 31 insertions(+)
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 <ryandesign@macports.org>
+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 <stdlib.h>
+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-r6.ebuild
similarity index 98%
rename from sci-libs/hdf5/hdf5-1.12.2-r5.ebuild
rename to sci-libs/hdf5/hdf5-1.12.2-r6.ebuild
index c27c86b3a6eb..c723c3ad3dde 100644
--- a/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.2-r6.ebuild
@@ -38,6 +38,7 @@ 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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/files/, sci-libs/hdf5/
@ 2022-05-03 2:28 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-05-03 2:28 UTC (permalink / raw
To: gentoo-commits
commit: 9acdbbd4c8debd771ac4a6e39c1073551f7ce43f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 02:27:07 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 3 02:27:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acdbbd4
sci-libs/hdf5: add 1.12.2
Lots of correctness and sanitizer fixes in .2 so possibly helps
with the sparc bug (although we've applied a workaround now anyway).
Bug: https://bugs.gentoo.org/686620
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/hdf5/Manifest | 1 +
.../hdf5/files/hdf5-1.12.2-cmake_installdirs.patch | 163 +++++++++++++++++++++
sci-libs/hdf5/hdf5-1.12.2.ebuild | 119 +++++++++++++++
3 files changed, 283 insertions(+)
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index bd0243d24944..54270f9e0c89 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,2 +1,3 @@
DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
DIST hdf5-1.12.1.tar.bz2 9724309 BLAKE2B cc75ba497188b33972218d02a7601acad1a0443bdb934ecd1641ef5996076fe120e3b72dba3a99d99f919fb4e478d1e531414448de9a7b97a0afde58a4c7c23f SHA512 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
+DIST hdf5-1.12.2.tar.bz2 10494264 BLAKE2B 99ca5b57f6f54fa044c909f0773de62b218c1f0ec3c011f88f3c227536dd719e77ddbe42d562b1214e8843e41d8fc56db499d7f122876fdd36ef31b235229cb7 SHA512 cbb4663570de76b11adb6bf62cfdb754371d31eeab04691479a5764a45207a9c1309665ab80f51c63a4b9b87354f9cbe6835cef506a9fd554d142c6d2bec21e5
diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch b/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch
new file mode 100644
index 000000000000..8218f31aea66
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch
@@ -0,0 +1,163 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,13 @@ if (CMAKE_VERSION VERSION_LESS "3.14.0")
+ endif()
+ endif ()
+
++include (GNUInstallDirs)
++set (HDF5_INSTALL_BIN_DIR "${CMAKE_INSTALL_FULL_BINDIR}")
++set (HDF5_INSTALL_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}")
++set (HDF5_INSTALL_DOC_DIR "${CMAKE_INSTALL_FULL_DOCDIR}")
++set (HDF5_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
++set (HDF5_INSTALL_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++
+ #-----------------------------------------------------------------------------
+ # Instructions for use : Sub-Project Build
+ #
+--- a/c++/src/CMakeLists.txt
++++ b/c++/src/CMakeLists.txt
+@@ -173,8 +173,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_CPP_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/doxygen/CMakeLists.txt
++++ b/doxygen/CMakeLists.txt
+@@ -36,7 +36,7 @@ if (DOXYGEN_FOUND)
+
+ install (
+ DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html
+- DESTINATION ${HDF5_INSTALL_DATA_DIR}
++ DESTINATION ${HDF5_INSTALL_DOC_DIR}
+ COMPONENT Documents
+ )
+
+--- a/fortran/src/CMakeLists.txt
++++ b/fortran/src/CMakeLists.txt
+@@ -537,8 +537,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/hl/c++/src/CMakeLists.txt
++++ b/hl/c++/src/CMakeLists.txt
+@@ -91,8 +91,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_CPP_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/hl/fortran/src/CMakeLists.txt
++++ b/hl/fortran/src/CMakeLists.txt
+@@ -324,8 +324,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/hl/src/CMakeLists.txt
++++ b/hl/src/CMakeLists.txt
+@@ -123,8 +123,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1288,8 +1288,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/CMakeInstallation.cmake
++++ b/CMakeInstallation.cmake
+@@ -31,7 +31,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
+ if (HDF5_EXPORTED_TARGETS)
+ install (
+ EXPORT ${HDF5_EXPORTED_TARGETS}
+- DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
++ DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake
+ FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
+ NAMESPACE ${HDF_PACKAGE_NAMESPACE}
+ COMPONENT configinstall
+@@ -67,12 +67,12 @@ set (HDF5_VERSION_MINOR ${HDF5_PACKAGE_VERSION_MINOR})
+ # Configure the hdf5-config.cmake file for the build directory
+ #-----------------------------------------------------------------------------
+ set (INCLUDE_INSTALL_DIR ${HDF5_INSTALL_INCLUDE_DIR})
+-set (SHARE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_INSTALL_CMAKE_DIR}" )
++set (SHARE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_INSTALL_LIB_DIR}/cmake" )
+ set (CURRENT_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}" )
+ configure_package_config_file (
+ ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in
+ "${HDF5_BINARY_DIR}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake"
+- INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}"
++ INSTALL_DESTINATION "${HDF5_INSTALL_LIB_DIR}/cmake"
+ PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR
+ INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
+ )
+@@ -81,19 +81,19 @@ configure_package_config_file (
+ # Configure the hdf5-config.cmake file for the install directory
+ #-----------------------------------------------------------------------------
+ set (INCLUDE_INSTALL_DIR ${HDF5_INSTALL_INCLUDE_DIR})
+-set (SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_CMAKE_DIR}" )
++set (SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_LIB_DIR}/cmake" )
+ set (CURRENT_BUILD_DIR "${CMAKE_INSTALL_PREFIX}" )
+ configure_package_config_file (
+ ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in
+ "${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake"
+- INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}"
++ INSTALL_DESTINATION "${HDF5_INSTALL_LIB_DIR}/cmake"
+ PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR
+ )
+
+ if (NOT HDF5_EXTERNALLY_CONFIGURED)
+ install (
+ FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake
+- DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
++ DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake
+ COMPONENT configinstall
+ )
+ endif ()
+@@ -109,7 +109,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
+ )
+ install (
+ FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake
+- DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
++ DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake
+ COMPONENT configinstall
+ )
+ endif ()
diff --git a/sci-libs/hdf5/hdf5-1.12.2.ebuild b/sci-libs/hdf5/hdf5-1.12.2.ebuild
new file mode 100644
index 000000000000..76d54a46d435
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
+
+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"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug doc examples fortran +hl mpi szip test threads unsupported zlib"
+
+REQUIRED_USE="
+ !unsupported? (
+ mpi? ( !cxx !threads )
+ threads? ( !cxx !fortran !hl )
+ )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ mpi? ( virtual/mpi[romio] )
+ szip? ( virtual/szip )
+ zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
+ app-doc/doxygen
+ virtual/latex-base
+)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.2-cmake_installdirs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ 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"
+ append-libs -lmpi
+ 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_configure() {
+ use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
+ local mycmakeargs=(
+ -DBUILD_STATIC_LIBS=OFF
+ -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+ -DHDF5_BUILD_EXAMPLES=OFF
+ -DALLOW_UNSUPPORTED=$(usex unsupported)
+ -DBUILD_TESTING=$(usex test)
+ -DHDF5_BUILD_CPP_LIB=$(usex cxx)
+ -DHDF5_BUILD_DOC=$(usex doc)
+ -DHDF5_BUILD_FORTRAN=$(usex fortran)
+ -DHDF5_BUILD_HL_LIB=$(usex hl)
+ -DHDF5_ENABLE_CODESTACK=$(usex debug)
+ -DHDF5_ENABLE_PARALLEL=$(usex mpi)
+ -DHDF5_ENABLE_SZIP_ENCODING=$(usex szip)
+ -DHDF5_ENABLE_SZIP_SUPPORT=$(usex szip)
+ -DHDF5_ENABLE_THREADSAFE=$(usex threads)
+ -DHDF5_ENABLE_Z_LIB_SUPPORT=$(usex zlib)
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # TODO: generate functioning example runners from their respective
+ # .in files - as of version 1.12.1 upstream only has it implemented
+ # for autoconf.
+ if use examples; then
+ # These are all useless outside the source tree
+ rm -f {examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+ rm -f hl/{examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+
+ dodoc -r examples
+ if use cxx; then
+ docinto c++
+ dodoc -r c++/examples
+ fi
+ if use fortran; then
+ docinto fortran
+ dodoc -r fortran/examples
+ fi
+ if use hl; then
+ docinto hl
+ dodoc -r hl/examples
+ if use cxx; then
+ docinto hl/c++
+ dodoc -r hl/c++/examples
+ fi
+ if use fortran; then
+ docinto hl/fortran
+ dodoc -r hl/fortran/examples
+ fi
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/files/, sci-libs/hdf5/
@ 2019-06-15 20:56 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-06-15 20:56 UTC (permalink / raw
To: gentoo-commits
commit: df2c62a10c80eb73d5c12bf143ae1c2c2321d980
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 19:42:00 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 20:56:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2c62a1
sci-libs/hdf5: Drop 1.8.18 and 1.10.1
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/hdf5/Manifest | 2 -
sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch | 43 ---------
sci-libs/hdf5/hdf5-1.10.1.ebuild | 95 --------------------
sci-libs/hdf5/hdf5-1.8.18.ebuild | 111 ------------------------
sci-libs/hdf5/metadata.xml | 5 +-
5 files changed, 1 insertion(+), 255 deletions(-)
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index e8b5dd2438c..64df5831a55 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,3 +1 @@
-DIST hdf5-1.10.1.tar.bz2 11769617 BLAKE2B 66ad762aed90cea9e58a9735bf0e189d78befc40cac0e566586e967f2b3ba6f5bf8a6bfd12a2f4062f8b20900c16d467c34134c17dedfd8f345cb96bd853a2fe SHA512 266b0e2f28c5fd540099a4955244ddb8c03aca3ad40d626358643f033a6ae5e9266a1d6c1d60925c7d42d24d28a1549d3305fe8ddb42cec2379af7231b93e554
DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-DIST hdf5-1.8.18.tar.bz2 10081294 BLAKE2B cf0d0c8a41576bcf816460eaabcfab29cfffba240721a64fe584c42fbb322470f29fb93c8513f7bbdedeeb392c2fe64cd3261b47b47de5b01828dae0b1929cd3 SHA512 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2
diff --git a/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch
deleted file mode 100644
index 72e09617097..00000000000
--- a/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/hl/src/H5LTanalyze.c
-+++ b/hl/src/H5LTanalyze.c
-@@ -40,6 +40,7 @@
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
-+#include <unistd.h>
-
- /* end standard C headers. */
-
---- a/hl/src/H5LTanalyze.l
-+++ b/hl/src/H5LTanalyze.l
-@@ -16,6 +16,7 @@
- %{
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include <hdf5.h>
- #include "H5LTparse.h"
-
---- a/test/cache_common.h
-+++ b/test/cache_common.h
-@@ -702,5 +702,8 @@ void validate_mdc_config(hid_t file_id,
- hbool_t compare_init,
- int test_num);
-
-+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
-+ const H5C_auto_size_ctl_t *b,
-+ hbool_t compare_init);
- #endif /* _CACHE_COMMON_H */
-
---- a/testpar/t_span_tree.c
-+++ b/testpar/t_span_tree.c
-@@ -37,6 +37,9 @@
- #include "hdf5.h"
- #include "H5private.h"
- #include "testphdf5.h"
-+#define H5S_PACKAGE
-+#define H5S_TESTING
-+#include "H5Spkg.h"
-
-
- static void coll_write_test(int chunk_factor);
diff --git a/sci-libs/hdf5/hdf5-1.10.1.ebuild b/sci-libs/hdf5/hdf5-1.10.1.ebuild
deleted file mode 100644
index 6cf18a83be0..00000000000
--- a/sci-libs/hdf5/hdf5-1.10.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib versionator prefix
-
-MY_P=${PN}-${PV/_p/-patch}
-MAJOR_P=${PN}-$(get_version_component_range 1-2 ${PV})
-
-DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
-
-LICENSE="NCSA-HDF"
-SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran +hl mpi static-libs szip threads zlib"
-
-REQUIRED_USE="
- cxx? ( !mpi ) mpi? ( !cxx )
- threads? ( !cxx !mpi !fortran !hl )"
-
-RDEPEND="
- mpi? ( virtual/mpi[romio] )
- szip? ( virtual/szip )
- zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool:2
- >=sys-devel/autoconf-2.69"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
- "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
- "${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch
-)
-
-pkg_setup() {
- tc-export CXX CC AR # workaround for bug 285148
- 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() {
- # 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
- sed -e '/^install:/ s/install-examples//' \
- -i Makefile.am || die #409091
- fi
- # enable shared libs by default for h5cc config utility
- sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/src/misc/h5cc.in || die
- hprefixify m4/libtool.m4
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- --enable-deprecated-symbols
- $(use debug && echo --enable-build-mode=debug || echo --enable-build-mode=production)
- $(use_enable debug codestack)
- $(use_enable cxx)
- $(use_enable fortran)
- $(use_enable hl)
- $(use_enable mpi parallel)
- $(use_enable threads threadsafe)
- $(use_with szip szlib)
- $(use_with threads pthread)
- $(use_with zlib)
- )
- autotools-utils_src_configure
-}
diff --git a/sci-libs/hdf5/hdf5-1.8.18.ebuild b/sci-libs/hdf5/hdf5-1.8.18.ebuild
deleted file mode 100644
index 4057134a614..00000000000
--- a/sci-libs/hdf5/hdf5-1.8.18.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib
-
-MY_P=${PN}-${PV/_p/-patch}
-
-DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-#SRC_URI="https://support.hdfgroup.org/ftp/HDF5/releases/${MY_P}/src/${MY_P}.tar.bz2"
-# TODO: return to proper SRC_URI once upstream fixes their release
-SRC_URI="https://support.hdfgroup.org/ftp/HDF5/current18/src/${MY_P}.tar.bz2"
-
-LICENSE="NCSA-HDF"
-SLOT="0/${PV%%_p*}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran fortran2003 +hl mpi static-libs szip threads zlib"
-
-REQUIRED_USE="
- threads? ( !cxx !mpi !fortran !hl )
- fortran2003? ( fortran )"
-
-RDEPEND="
- mpi? ( virtual/mpi[romio] )
- szip? ( virtual/szip )
- zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool:2
- >=sys-devel/autoconf-2.69"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
- "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
- "${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch
- "${FILESDIR}"/${PN}-1.8.15-implicits.patch
-)
-
-pkg_setup() {
- tc-export CXX CC AR # workaround for bug 285148
- if use fortran; then
- use fortran2003 && FORTRAN_STANDARD=2003
- fortran-2_pkg_setup
- fi
- 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
- if use cxx ; then
- export CXX=mpicxx
- ewarn "USE='mpi cxx' requires a configuration unsupported by upstream. Use at your own risk."
- ewarn "In particular, the C++ API is not parallel safe."
- fi
- 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() {
- # 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
- sed -e '/^install:/ s/install-examples//' \
- -i Makefile.am || die #409091
- fi
- # enable shared libs by default for h5cc config utility
- sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in || die
- # bug #419677
- use prefix && \
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \
- -Wl,-rpath,"${EPREFIX}"/$(get_libdir)
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-production
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- --enable-deprecated-symbols
- $(use_enable prefix sharedlib-rpath)
- $(use_enable debug debug all)
- $(use_enable debug codestack)
- $(use_enable cxx)
- $(use_enable fortran)
- $(use_enable fortran2003)
- $(use_enable hl)
- $(use_enable mpi parallel)
- $(use_enable threads threadsafe)
- $(use_with szip szlib)
- $(use_with threads pthread)
- $(use_with zlib)
- $(use mpi && use cxx && echo --enable-unsupported)
- )
- autotools-utils_src_configure
-}
diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index 9c9d5071aa8..040542a30ae 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -12,9 +12,6 @@
than 2 GB, and supports parallel I/O.
</longdescription>
<use>
- <flag name="fortran2003">Enable new features that require Fortran 2003
- (http://www.hdfgroup.org/HDF5/doc/fortran/NewFeatures_F2003.pdf)</flag>
- <flag name="hl">Enable high level API
- (https://support.hdfgroup.org/HDF5/doc/HL/index.html)</flag>
+ <flag name="hl">Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-14 3:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-14 3:39 [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/files/, sci-libs/hdf5/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-05-03 2:28 Sam James
2019-06-15 20:56 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox