commit: 640e352f19bbc428ce82f043b15f6677dfdc26ea Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Fri Jul 28 14:34:37 2023 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Sat Jul 29 02:54:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640e352f
sci-libs/rocSOLVER: non-versioned dependency on libfmt. Version bump to 5.4.2, in line with rocBLAS. Bug: https://bugs.gentoo.org/908651 Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> sci-libs/rocSOLVER/Manifest | 1 + .../rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch | 34 ++++++++++++++++++++++ ...LVER-5.1.3.ebuild => rocSOLVER-5.1.3-r1.ebuild} | 6 ++-- ...cSOLVER-5.1.3.ebuild => rocSOLVER-5.4.2.ebuild} | 11 +++---- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest index 24a5bc028509..35de2a25db03 100644 --- a/sci-libs/rocSOLVER/Manifest +++ b/sci-libs/rocSOLVER/Manifest @@ -1 +1,2 @@ DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753 +DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6 diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch b/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch new file mode 100644 index 000000000000..3e0ef897b71e --- /dev/null +++ b/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch @@ -0,0 +1,34 @@ +commit bafa8f30b6f83d5f02bb65bb47b2943a0cb3c290 +Author: Cory Bloor <cordell.bl...@amd.com> +Date: Wed Jan 25 14:52:35 2023 -0700 + + Fix use of fmt 9.0 and later in logging test (#515) + + The implicitly defined formatter that rocsolver was using for + std::filesystem::path has been removed from fmt 9.0 and later. + + This change doesn't actually fix compatibility with the official + fmt 9.0 or 9.1 releases, because those releases are still + incompatible with HIP. However, the change is sufficient for using + rocsolver with fmt@9 from Spack (because the fix has been backported). + +diff --git a/clients/gtest/logging_gtest.cpp b/clients/gtest/logging_gtest.cpp +index e4f594a..da7ae04 100644 +--- a/clients/gtest/logging_gtest.cpp ++++ b/clients/gtest/logging_gtest.cpp +@@ -1,5 +1,5 @@ + /* ************************************************************************ +- * Copyright (c) 2022 Advanced Micro Devices, Inc. ++ * Copyright (c) 2022-2023 Advanced Micro Devices, Inc. + * ************************************************************************ */ + + #include <cstdlib> +@@ -49,7 +49,7 @@ protected: + { + if(HasFailure() && std::getenv("ROCSOLVER_TEST_DEBUG")) + fmt::print(stderr, "ROCSOLVER_TEST_DEBUG is set so {} was not removed.\n", +- log_filepath); ++ log_filepath.string()); + else + EXPECT_TRUE(fs::remove(log_filepath)); + } diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild similarity index 94% copy from sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild copy to sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild index e2db9aba2a19..11cedfb8deff 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,8 +19,8 @@ IUSE="test benchmark" REQUIRED_USE="${ROCM_REQUIRED_USE}" RDEPEND="dev-util/hip - sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] - =dev-libs/libfmt-8* + sci-libs/rocBLAS[${ROCM_USEDEP}] + dev-libs/libfmt benchmark? ( virtual/blas )" DEPEND="${RDEPEND}" BDEPEND="test? ( dev-cpp/gtest diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild similarity index 89% rename from sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild rename to sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild index e2db9aba2a19..dce60e072b37 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,18 +19,15 @@ IUSE="test benchmark" REQUIRED_USE="${ROCM_REQUIRED_USE}" RDEPEND="dev-util/hip - sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] - =dev-libs/libfmt-8* + sci-libs/rocBLAS[${ROCM_USEDEP}] + dev-libs/libfmt benchmark? ( virtual/blas )" DEPEND="${RDEPEND}" BDEPEND="test? ( dev-cpp/gtest >=dev-util/cmake-3.22 virtual/blas )" -PATCHES=( - "${FILESDIR}/${PN}-4.2.0-add-stdint-header.patch" - "${FILESDIR}/${PN}-5.0.2-libfmt8.patch" -) +PATCHES=( "${FILESDIR}"/${PN}-5.4.2-libfmt9.patch ) RESTRICT="!test? ( test )"
