diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-05 09:05:42 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-05 09:05:42 +0000 |
| commit | c3870d5920e6ee600e9360c3a5b004b7ad0c5abf (patch) | |
| tree | 783e53d0526f67659a53911dd1dd9ca88eaad19a /dev-libs/pocl | |
| parent | 94393d04ccce851b0084c650c99a2eca52f9d3bb (diff) | |
gentoo auto-resync : 05:12:2022 - 09:05:41
Diffstat (limited to 'dev-libs/pocl')
| -rw-r--r-- | dev-libs/pocl/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/pocl/files/pocl-3.0-cuda.patch | 48 | ||||
| -rw-r--r-- | dev-libs/pocl/pocl-3.0.ebuild | 1 |
3 files changed, 51 insertions, 1 deletions
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest index 193fd7cf4322..f9b8cac79d06 100644 --- a/dev-libs/pocl/Manifest +++ b/dev-libs/pocl/Manifest @@ -1,5 +1,6 @@ +AUX pocl-3.0-cuda.patch 1611 BLAKE2B 6baaac79d0182ac91210c0be40239f7d955b57cb2ae26bd70569d952e4f063a5949ecc88a4b1e6ef2a51fa14a62365e627d5e37b35be5d4b46442beff468243e SHA512 95326a202962cec2d3f53bf7dfdcbe1b47abdd25544444f164e1cd2aa5706766342e062045f645c3e1e0e917ca305563df414304c7161e303c3bd55cb313eb03 AUX pocl-3.0-fix-version.patch 354 BLAKE2B 8e2b4570c204dc37bb70f20b01838f0c21a6aec57c258a206eb5e82bed69fe01d65f704cfd184c102102fd3a06eb75fb092a2ccfa4d8729192451fa894afc7e9 SHA512 bfe023132ab8080c8539a783586f9c556e7ae4cb8113c3c96b33ac02bd7d4044b36bf13e1556e181af9c12acb4b0e0778af25fd66df1fe6e7ab533c2b68108c4 AUX pocl-3.0-icd.patch 5679 BLAKE2B 4f9edba1e71afb8c059da8f1adcb59f0ccca1bb33ad0c05eb2d3b27c1e7ea6bfa3a2d60f6e6c83136146275aed35a6501713883dad72011379e0ed4ae64eba74 SHA512 436b7f6e53372f00a8c70bb00229d22d05f24687ba2822f4b26590cbdffe64e8c2909d2f1ab6e0650fe18db7507c6bba9f5bcee1a09ec1fe5b42955ddcb99db7 DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea -EBUILD pocl-3.0.ebuild 3665 BLAKE2B 65b2a62cee9f1dd3db5311a0bbe72cbe4684373806c0041a98dd3885832ff257a31a56f35ce6cf7ed83e351f8531d9ae576dccc686b5eef4213650d49c5295c5 SHA512 5e2ece4609ca2971fd8934728a5954a503936ba03b210359f92f176dff092ed9b2d5227d8fe6d8e5ba0e67fa3227ec86d2e732220d0458f3973b51db498ed9e2 +EBUILD pocl-3.0.ebuild 3696 BLAKE2B 352e60e2beb92a82af44eaf517afd6595b2e2049ba45b23fdcd2fe3ccd0945339a51c5c120ed699b20ac46120fff625bba7ac22e44f1039688278cf971be9eae SHA512 d6b6bc402ae1c5f87062b2aa36fb933ace430d6f87d0a33458cd2b7d444460b6ba0f9c601c047934ce1cb6163c4be9bd33a76e3011a018c9e0a2c67b5a92b149 MISC metadata.xml 1191 BLAKE2B 62b985abe8c99532cc20302846fe9e05c77bbc993ef38863d44bd754df2bc388e5d094917ad11d1b117e9dfda355e35f5592fc2ede5a3bc8e91939c9e6aef9e3 SHA512 a9cdbff5f2b2e2141c6299137baed08d1e8482f3b976ef494b595f58092761aab66f33e539d236d8b7f1c564d5fa2aac4855447b54bc189f1dd81faf25fc32ec diff --git a/dev-libs/pocl/files/pocl-3.0-cuda.patch b/dev-libs/pocl/files/pocl-3.0-cuda.patch new file mode 100644 index 000000000000..d6729b0fedce --- /dev/null +++ b/dev-libs/pocl/files/pocl-3.0-cuda.patch @@ -0,0 +1,48 @@ +https://github.com/pocl/pocl/pull/1146 + +From 978afab0ba9f90fbdb39ed4ffc52f8ca46d2bfa9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 5 Dec 2022 04:17:05 +0000 +Subject: [PATCH] pocl-cuda: fix build with -DPOCL_DEBUG_MESSAGES=OFF +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build failure: +``` +/var/tmp/portage2/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/cuda/pocl-cuda.c: In function ‘load_or_generate_kernel’: +/var/tmp/portage2/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/cuda/pocl-cuda.c:981:9: error: ‘pocl_debug_messages_filter’ undeclared (first use in this function) + 981 | if (!(pocl_debug_messages_filter & POCL_DEBUG_FLAG_CUDA)) + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +``` + +Bug: https://bugs.gentoo.org/862633 +--- a/lib/CL/devices/cuda/pocl-cuda.c ++++ b/lib/CL/devices/cuda/pocl-cuda.c +@@ -1093,6 +1093,7 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device, + /* TODO: When can we unload the module? */ + CUmodule module; + ++#ifdef POCL_DEBUG_MESSAGES + if (!(pocl_debug_messages_filter & POCL_DEBUG_FLAG_CUDA)) + { + result = cuModuleLoad (&module, ptx_filename); +@@ -1100,6 +1101,7 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device, + } + else + { ++#endif + struct stat st; + stat (ptx_filename, &st); + +@@ -1132,7 +1134,9 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device, + + free (log); + free (buffer); ++#ifdef POCL_DEBUG_MESSAGES + } ++#endif + + /* Get kernel function */ + CUfunction function; + diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild index 51f20465bc25..7f94d77e1958 100644 --- a/dev-libs/pocl/pocl-3.0.ebuild +++ b/dev-libs/pocl/pocl-3.0.ebuild @@ -47,6 +47,7 @@ BDEPEND="${CLANG_DEPS} PATCHES=( "${FILESDIR}"/${P}-icd.patch "${FILESDIR}"/${P}-fix-version.patch + "${FILESDIR}"/${P}-cuda.patch ) python_check_deps() { |