From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- sci-libs/hdf5/Manifest | 11 +- .../hdf5/files/hdf5-1.12.2-cmake_installdirs.patch | 164 +++++++++++++++++++++ sci-libs/hdf5/hdf5-1.10.5-r1.ebuild | 7 +- sci-libs/hdf5/hdf5-1.10.5.ebuild | 5 +- sci-libs/hdf5/hdf5-1.12.1-r1.ebuild | 7 +- sci-libs/hdf5/hdf5-1.12.1.ebuild | 5 +- sci-libs/hdf5/hdf5-1.12.2-r1.ebuild | 120 +++++++++++++++ 7 files changed, 305 insertions(+), 14 deletions(-) create mode 100644 sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch create mode 100644 sci-libs/hdf5/hdf5-1.12.2-r1.ebuild (limited to 'sci-libs/hdf5') diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest index e39490452c26..fca66049cd37 100644 --- a/sci-libs/hdf5/Manifest +++ b/sci-libs/hdf5/Manifest @@ -1,11 +1,14 @@ AUX hdf5-1.12.1-cmake_installdirs.patch 4313 BLAKE2B 78b894a3535c71dbd673e2061e09e1a57d57c1d65418ac87e51669e7cf8a77f023aac076686e978b89903fb0aa74f0511f779ceb149ab783e5624ec24bf5c6a6 SHA512 4a8fce1e3a5ae9d8cdca4fa377011fb7333de0b233e79c6eeed9a24154925eb8dededfe8cff4e28a7cedeb2fbfe194df1a5f18629d56de47b4ba3097824e6b7d +AUX hdf5-1.12.2-cmake_installdirs.patch 7289 BLAKE2B 7a8846200194c93f014e1862165d153e3dc21df87f08458c827356051cb4e1ffc90df4f176063356347eea881153f48c791cf51fa209ec3b5ca883edc13c06b1 SHA512 3c0933d64207ddead06cd575d40d919402a94a5317f14da1a5ee3b06c88ac65b108754d698715618b87104d8d471eaa6131310b0077202eac0ed221b3da18c5b AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8c3c4da0c373f88b3fdf21e1f89b169b747d49572239385228687cfc10380bdceb9ca6d1ac0d5f5154cb7a328f8a2d509fb28d SHA512 e43021ceb83909ab06ba378363c192aa0f1b34cc7c2b121f5000e215516dbdea1b825a53ac4023073bf4870a5c3452c22f5535391d95af45ad63a309e1ffa5a4 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4 DIST hdf5-1.12.1.tar.bz2 9724309 BLAKE2B cc75ba497188b33972218d02a7601acad1a0443bdb934ecd1641ef5996076fe120e3b72dba3a99d99f919fb4e478d1e531414448de9a7b97a0afde58a4c7c23f SHA512 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd -EBUILD hdf5-1.10.5-r1.ebuild 2883 BLAKE2B ddfc519217494eb2f3a2cd2a37f70d9e2005cd049299fbaf2386414db0eac65a2655b39fba85231896cd2f2ef42fd15d57273b77fa53e0d492a889fc6db51fbe SHA512 007a97a089002e330569913ce42afd92b63d659b9d9f4fabe85170d7633950da025cfc55273f564faf1aec52d3ad4c704825cc501bd441d522f65238ff44ad88 -EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B 56dc60e54a2e3758b32eba9977bb96e67bcdec38670579e985733ecede749f638370bee98959986a76e841c8adf4a92740fae6b8c8ed36e5e0ba2814a2f82537 SHA512 ebf92105b2d149f1947dd0d95b2ef5da85b4d57a51eeb4e5c8d9535e706b06e6c46910ee8671f1d44021636cec71070755aa7d7e62db4f9e1fb39d7e0d7d4fbd -EBUILD hdf5-1.12.1-r1.ebuild 3379 BLAKE2B c8071ed6c8443f0aa06848eab9d8e5719de69216b200ea588f82e33e7e8dd71c6260e2bf5c1e45cc261e48518a65252b3e7d3a57313be5102f22febe50923d9d SHA512 34c4ec92af1a43f6b8978ebf38360c8372559ee204d9b737560671122879c3818e040f374c735366a45756dd7298d32414b90d07dfb90338209e283275a50a54 -EBUILD hdf5-1.12.1.ebuild 3061 BLAKE2B a21c786534715cbfdb57208a021c6f48ff89417db20490673bb86c362b7065280f810135a6b60ca20d6cbb6a7bcc6f332f64cada97ca8fe25a52bf9e868f905a SHA512 0f809656f7088844eaeca31695877919cf3aae466bf93e1b3c9bd72474712415dca62f39bc51c6e2265c2f64427a5c1274fbb18092d614ee32c0f29d6068c0c9 +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.10.5.ebuild 2770 BLAKE2B 33a671a87978ba04e1b43cbc048093f12d6303841353124a0ba405fec1d32fdc2cb15ed627b968fc5c3feeba151e78525adf77be3f420993d02f793cf094b96d SHA512 3bb860418e226967b1a2b50ecbbeb6ca793790a7915d6cb6f9ea201816cbc555b455596e200fc2504084597ccbe4d1ae1f91cbc64d68c7a39d2eeae998194304 +EBUILD hdf5-1.12.1-r1.ebuild 3468 BLAKE2B da5ba395f8971076a6a3186332f94446dadc7be2817fbb488c612bf4f1b283fc927ea33b7eff23dfbe5b43c1c27a85d72d72ddd4fb617e37a79416fede96bd1b SHA512 96c6c2f95e13a7841f6a9fa63e838ad218819bd0c854c8994a382c15e2f3fff1ae11f099cd613c4b41efa726b1616ead0cf9c4a0d6aedf6d0c7b2d8ca0d8f7ea +EBUILD hdf5-1.12.1.ebuild 3144 BLAKE2B 2bd023c0ade920fc795f4434260318095a34b200ddb6a458a6ee7d647fac79d4e31029f93a0d2aafede8682e515a9f9c9db46b5a976f07cd83d5086f77538079 SHA512 10ce8493fd3fa421d8c71267e7c57adaac490244742ed93166ce634f5b956b392efb3b86814c17ad8bfba3347c4e3be54b5688b8eec3af848f1d13c341bb8bcc +EBUILD hdf5-1.12.2-r1.ebuild 3168 BLAKE2B cf26e034088a10e89f8130fc76e7f52395b5ad61e69b946afe53946d44d9c35c87452d39dd501e54c928e645482cf6543eae8d0d4c787d17843130aad10e4cf1 SHA512 b4a1b842d6adf407b9b9b86be1da8dcea61a0c26d9c8107a0331242b36ef5e2bbf3c1d8078f2ff6be2cbff56f1402c025961aa0be739dac5565eb2cc54e3cefb MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b 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..6ea7520c0f13 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch @@ -0,0 +1,164 @@ +https://github.com/HDFGroup/hdf5/pull/1716 +--- 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.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild index b7aac2788497..aa45759413ec 100644 --- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild +++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" FORTRAN_NEEDED="fortran" -inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix +inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix MY_P="${PN}-${PV/_p/-patch}" MAJOR_P="${PN}-$(ver_cut 1-2)" @@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_ LICENSE="NCSA-HDF" SLOT="0/${PV%%_p*}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib" REQUIRED_USE=" @@ -83,6 +83,7 @@ src_prepare() { } src_configure() { + use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620 local myconf=( --disable-static --enable-deprecated-symbols diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild index f33f957fdad7..1b6770c23e14 100644 --- a/sci-libs/hdf5/hdf5-1.10.5.ebuild +++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 FORTRAN_NEEDED=fortran -inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix +inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix MY_P=${PN}-${PV/_p/-patch} MAJOR_P=${PN}-$(ver_cut 1-2) @@ -78,6 +78,7 @@ src_prepare() { } src_configure() { + use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620 econf \ --disable-static \ --enable-deprecated-symbols \ diff --git a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild index a445755a1291..32a8891c8155 100644 --- a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild +++ b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# 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 +inherit cmake flag-o-matic fortran-2 toolchain-funcs MY_P="${PN}-${PV/_p/-patch}" MAJOR_P="${PN}-$(ver_cut 1-2)" @@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_ LICENSE="NCSA-HDF" SLOT="0/${PV%%_p*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="cxx debug doc examples fortran +hl mpi ros3 szip test threads unsupported zlib" REQUIRED_USE=" @@ -66,6 +66,7 @@ pkg_setup() { } src_configure() { + use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620 local mycmakeargs=( # Workaround needed to allow build with USE=fortran when an older # version is installed. See bug #808633 and diff --git a/sci-libs/hdf5/hdf5-1.12.1.ebuild b/sci-libs/hdf5/hdf5-1.12.1.ebuild index c5ef043111b3..8248d6614f5a 100644 --- a/sci-libs/hdf5/hdf5-1.12.1.ebuild +++ b/sci-libs/hdf5/hdf5-1.12.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# 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 +inherit cmake flag-o-matic fortran-2 toolchain-funcs MY_P="${PN}-${PV/_p/-patch}" MAJOR_P="${PN}-$(ver_cut 1-2)" @@ -62,6 +62,7 @@ pkg_setup() { } src_configure() { + use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620 local mycmakeargs=( -DBUILD_STATIC_LIBS=OFF -DFETCHCONTENT_FULLY_DISCONNECTED=ON diff --git a/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild new file mode 100644 index 000000000000..d5390cee5762 --- /dev/null +++ b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild @@ -0,0 +1,120 @@ +# 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 + -DONLY_SHARED_LIBS=ON + -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 +} -- cgit v1.2.3