commit: ec263559dc06dcf768ef474d9099e923e59b0405 Author: Martin Kletzander <nert.pinx <AT> gmail <DOT> com> AuthorDate: Wed Jan 18 15:19:45 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 20 01:19:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec263559
dev-libs/pocl: Fix possible build failure in 3.1 There is a possible missing macro which was now fixed upstream, but not in 3.1, so this is a backport. Not raising the release number since there is no need for rebuild of installed pocl-3.1. Signed-off-by: Martin Kletzander <nert.pinx <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29159 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/pocl/files/pocl-3.1-nodebug.patch | 29 +++++++++++++++++++++++++++++ dev-libs/pocl/pocl-3.1.ebuild | 4 ++++ 2 files changed, 33 insertions(+) diff --git a/dev-libs/pocl/files/pocl-3.1-nodebug.patch b/dev-libs/pocl/files/pocl-3.1-nodebug.patch new file mode 100644 index 000000000000..ea1085dc4a49 --- /dev/null +++ b/dev-libs/pocl/files/pocl-3.1-nodebug.patch @@ -0,0 +1,29 @@ +https://github.com/pocl/pocl/commit/a13cb332d6678d4556d7319b284b77c371c4b91e + +commit a13cb332d6678d4556d7319b284b77c371c4b91e +Author: Martin Kletzander <nert.p...@gmail.com> +Date: Tue Jan 17 09:04:41 2023 +0100 + + Add stub macro POCL_MSG_PRINT_ALMAIF_MMAP without POCL_DEBUG_MESSAGES + + Without this the build fails with the following error when built without + POCL_DEBUG_MESSAGES: + + ../lib/CL/devices/almaif/MMAPRegion.cc: In constructor ‘MMAPRegion::MMAPRegion(size_t, size_t, int)’: + ../lib/CL/devices/almaif/MMAPRegion.cc:43:3: error: ‘POCL_MSG_PRINT_ALMAIF_MMAP’ was not declared in this scope; did you mean ‘POCL_MSG_PRINT_ALMAIF2’? + 43 | POCL_MSG_PRINT_ALMAIF_MMAP( + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + | POCL_MSG_PRINT_ALMAIF2 + + and about 10 more. + +--- a/lib/CL/pocl_debug.h ++++ b/lib/CL/pocl_debug.h +@@ -284,6 +284,7 @@ POCL_EXPORT + + #define POCL_MSG_PRINT_ALMAIF2(...) do {} while (0) + #define POCL_MSG_PRINT_ALMAIF(...) do {} while (0) ++ #define POCL_MSG_PRINT_ALMAIF_MMAP(...) do {} while (0) + #define POCL_MSG_PRINT_PROXY2(...) do {} while (0) + #define POCL_MSG_PRINT_PROXY(...) do {} while (0) + #define POCL_MSG_PRINT_VULKAN2(...) do {} while (0) diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild index 19be29e62882..f5e877a39aea 100644 --- a/dev-libs/pocl/pocl-3.1.ebuild +++ b/dev-libs/pocl/pocl-3.1.ebuild @@ -57,6 +57,10 @@ llvm_check_deps() { has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}" } +PATCHES=( + "${FILESDIR}"/${P}-nodebug.patch +) + pkg_setup() { use doc && python-any-r1_pkg_setup
