commit: c6b78c690fb95e93941da84ee8ca4a5bcbeddeb8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 29 10:17:48 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jun 29 10:17:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b78c69
dev-util/nvidia-cuda-toolkit: unbundle openssl properly
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild | 4 ++--
dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
index 81874e5dce5f..ac16815eb2cc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
@@ -198,8 +198,8 @@ src_install() {
rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6
|| die
# unbundle openssl
- rm
"${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libssl.so* ||
die
- rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libssl.so* ||
die
+ rm
"${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so*
|| die
+ rm
"${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
# unbundle libz
rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libz.so* || die
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
index 3d56dff74f93..89752e0c6d16 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
@@ -218,8 +218,8 @@ src_install() {
rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6
|| die
# unbundle openssl
- rm
"${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libssl.so* ||
die
- rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libssl.so* ||
die
+ rm
"${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so*
|| die
+ rm
"${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
# unbundle libpfm
rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* ||
die
