diff options
Diffstat (limited to 'dev-util/nvidia-cuda-toolkit')
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-glibc-2.41.patch | 72 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1-r1.ebuild (renamed from dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1.ebuild) | 7 |
3 files changed, 80 insertions, 2 deletions
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest index 4d7b3cc0ea96..b23df22c4f69 100644 --- a/dev-util/nvidia-cuda-toolkit/Manifest +++ b/dev-util/nvidia-cuda-toolkit/Manifest @@ -1,4 +1,5 @@ AUX cuda-config.in 407 BLAKE2B 5f7a0d50d774db58c180b767f00bead7c7dbf5f6b3b4a2f960dfc3b8450f7abf5c2b67c6620c5318f1331646dd2003d61c70a4c31359efd16ff418ecc9d0b446 SHA512 363903b999c43a47a48c52e8898c6044fadcc66d259338ee22863e859c2bc9873a2f1392aa83c9182486d3aa4eaeb5f164cf8ccf29cc74fd8ad56245f76a039a +AUX nvidia-cuda-toolkit-glibc-2.41.patch 3067 BLAKE2B 66482f56a1797116f9c8cb6014265c9dbc1fd4032ca2b68e59eca1a4ba45b3b86bc3aca8869752ee0d52392305196efa679258399a252b145ce5c53c9e35804b SHA512 58acf6c195fe85e4e25bb17af3b03acfe6c5dfe1111f5705f39a6a3ef3ff4621f59bece49d1dbbdd4f81948c1c2d707d2948ae9148e328c09e517f809fd503cb DIST cuda_11.8.0_520.61.05_linux.run 4336730777 BLAKE2B cfdb4a51c49ee504e56a4a95de4e477ef207b678527cbb633c1e83e667f1a62c0f67038befd0b10f7ae24cda9c8bc5c54293d06a05b2e45be6cf677e40f71f17 SHA512 e96e1389abed34b5093b3a1d4e6ae9f3d4f8406621b1475f378efae65868657efce22da03b5b4e0a548d9635e406b8690b18b17b186d03ecb3ca0703c5d5787a DIST cuda_12.3.2_545.23.08_linux.run 4368514070 BLAKE2B bfb6239b7669636e2ef424921f5a1dd99409a0351ea7d3453fcec3d484e714d87639e733cfae913b0f222d7af8acb7bebae340ea8af53fb7ab320805abb7b230 SHA512 dce569e42955fc351a6b52b2876948029d5183bb000754f0cdcba754673a280acfd4c9e4d8cf61d572ed045de006e0bbb0e8ff32012e6cc336be9c05fd529340 DIST cuda_12.4.0_550.54.14_linux.run 4454353277 BLAKE2B da339a44ac21799a88b4573e9afc0866f11649707594383414cb0c729b36dc63d55032e5ccbbbe46e84c1dc88fc76e466067be7ef2ae3d131a74190c548d76ba SHA512 329b81c63dcefa5c6713eeb2dc5ccc223f5b456f4b7558bd3723d166357d8bb4c79d12082ea396aaadae8b5593b20584f7bd0cf617bb3494e4423b58726255a1 @@ -14,5 +15,5 @@ EBUILD nvidia-cuda-toolkit-12.4.1.ebuild 9515 BLAKE2B 2fdc866adfe7f552349bcce9b6 EBUILD nvidia-cuda-toolkit-12.5.0-r1.ebuild 9535 BLAKE2B b8b50bede8a66a8bce76f6677991b0cf433c3338e89dc82597473dc63874810b9b7461de97d9abc55a471b38618445b7c6dc8e37c18caa8c7d0e3fb9cbdf835e SHA512 8f983c2dc5797fa82f144008ddce2b7eb4b2aaa66b1cf439be25a67fba4a0b4ff5af3480451d53bf0375917e1219facf48e69e7d213aca1e3acbb984595a4d41 EBUILD nvidia-cuda-toolkit-12.5.1.ebuild 9535 BLAKE2B ea6b46070159a18d8f541af47d648a79b75f7f964d689418220e4eaf87c56fc000eb39fed84637c161aa5f18e5f7e03f0615cbec6670517fd2efefd83139a0a4 SHA512 47bca7b76aad3842f37d8da4fbbdf646a1ca2cc93bc7ae870d8e164a05f735974ca28d69a99a6d0ffcd331e5134025b3819360f27c65dc6c27338756bfc74ba8 EBUILD nvidia-cuda-toolkit-12.6.0.ebuild 9535 BLAKE2B 984ec77cc39675ba22703339ecbd5596452a5631c7303e4db492bad0b80496ea13151cb25f87a7c0e39d9d2a173be7ad9469a91acfd785abb83632caae230297 SHA512 efbf2fcc39f60ca1f35f15202e924146618b4441c090d26e07048e10dee6ddd79f10640b1c6d8d2e84a218edb6a1382f2398eaf182a503d5dd6dbce250844af3 -EBUILD nvidia-cuda-toolkit-12.6.1.ebuild 9535 BLAKE2B f78cfef4c17ae924032894ff649a5f2911b6fd28727b2ca1f7176b4c009e0841a4936a49998e9029c3c415730f012ab24452f3f0ddf047a48f26811b7c2835eb SHA512 1395bb046c7443c69dfc4f589f9ba88956205faf7779704ecfc0928664d2cbfff07f8db378c20371f84d1971f01aa781bfde95a9a15d16053ddb5aa485467ee3 +EBUILD nvidia-cuda-toolkit-12.6.1-r1.ebuild 9685 BLAKE2B dbbfe46f57fc1a42a91d8a5b1e72651adb9d204abb05512945dd9af691872f4285c69918918a131adcfb749e7832c31bf8738321f8909a4656824c2727e899d2 SHA512 519dcf9c06f7a11a6405dac69b003e6b37d1d32007f3231038d3254c9901815a25cbdceb3401adfb783be77c683ce53acd76ea3722bb4b2c66d5e9265399967c MISC metadata.xml 761 BLAKE2B a6ae653c6206cbc05349297499b6dde91bce6d543e10bd5ea915cfe9729dfa6f1eb954ae09c2e4d3997f51315ae090b38606c21b5099e750596ea66fdd93e817 SHA512 9133517d805201d25b651e48abed90394c88ef33a2571ab20b3b19d365f85a90478486c7c087c9150d7d9f6e4026873c5236c64ed649fd3bfc8f9b81479dcc59 diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-glibc-2.41.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-glibc-2.41.patch new file mode 100644 index 000000000000..c8d43014d30a --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-glibc-2.41.patch @@ -0,0 +1,72 @@ +From cae8ab12c9f981f110bb2e1318d9c5306e3a2d81 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx@gmail.com> +Date: Sat, 8 Feb 2025 16:34:42 +0100 +Subject: [PATCH] Updates headers for glibc-2.41 + +Match the extern definitions in cuda-crt headers with the changes in glibc-2.41. + +/usr/include/bits/mathcalls.h(79): error: exception specification is +incompatible with that of previous function "cospi" (declared at line 2601 +of +/opt/cuda-12.8.0/bin/../targets/x86_64-linux/include/crt/math_functions.h) + + extern double cospi (double __x) noexcept (true); extern double __cospi (double __x) noexcept (true); + +See-Also: https://sourceware.org/git/?p=glibc.git;a=commit;h=0ae0af68d8fa3bf6cbe1e4f1de5929ff71de67b3 +Signed-off-by: Paul Zander <negril.nx@gmail.com> + +diff --git a/builds/cuda_nvcc/targets/x86_64-linux/include/crt/math_functions.h b/builds/cuda_nvcc/targets/x86_64-linux/include/crt/math_functions.h +index d8201f9..a9b19d4 100644 +--- a/builds/cuda_nvcc/targets/x86_64-linux/include/crt/math_functions.h ++++ b/builds/cuda_nvcc/targets/x86_64-linux/include/crt/math_functions.h +@@ -2553,7 +2553,11 @@ extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ float rcbrt + * + * \note_accuracy_double + */ ++#if __GLIBC_USE (IEC_60559_FUNCS_EXT_C23) ++extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ double sinpi(double x) noexcept (true); ++#else + extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ double sinpi(double x); ++#endif + /** + * \ingroup CUDA_MATH_SINGLE + * \brief Calculate the sine of the input argument +@@ -2576,7 +2580,11 @@ extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ double sinpi + * + * \note_accuracy_single + */ ++#if __GLIBC_USE (IEC_60559_FUNCS_EXT_C23) ++extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ float sinpif(float x) noexcept (true); ++#else + extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ float sinpif(float x); ++#endif + /** + * \ingroup CUDA_MATH_DOUBLE + * \brief Calculate the cosine of the input argument +@@ -2598,7 +2606,11 @@ extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ float sinpi + * + * \note_accuracy_double + */ ++#if __GLIBC_USE (IEC_60559_FUNCS_EXT_C23) ++extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ double cospi(double x) noexcept (true); ++#else + extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ double cospi(double x); ++#endif + /** + * \ingroup CUDA_MATH_SINGLE + * \brief Calculate the cosine of the input argument +@@ -2620,7 +2632,11 @@ extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ double cospi + * + * \note_accuracy_single + */ ++#if __GLIBC_USE (IEC_60559_FUNCS_EXT_C23) ++extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ float cospif(float x) noexcept (true); ++#else + extern __DEVICE_FUNCTIONS_DECL__ __device_builtin__ float cospif(float x); ++#endif + /** + * \ingroup CUDA_MATH_DOUBLE + * \brief Calculate the sine and cosine of the first input argument +-- +2.48.1 + diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1-r1.ebuild index 32ef330046ed..449229fd2631 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -59,6 +59,11 @@ src_prepare() { "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die default + + # we assume you can't downgrade glibc + if has_version ">=sys-libs/glibc-2.41"; then + eapply "${FILESDIR}/nvidia-cuda-toolkit-glibc-2.41.patch" + fi } src_install() { |