From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/
Date: Mon, 22 Jun 2020 20:57:08 +0000 (UTC) [thread overview]
Message-ID: <1592859357.955640ef357de349e242eca5d7848286a450f35e.marecki@gentoo> (raw)
commit: 955640ef357de349e242eca5d7848286a450f35e
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 20:45:03 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 20:55:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=955640ef
dev-libs/opencl-clang:10: Fix llvm-tblgen detection
Upstream CMake scripts simply set LLVM_TABLEGEN_EXE to "llvm-tblgen".
This works fine for 32-bit builds of SLOT=8 and 9 as well as 64-bit
builds of all three slots, however 32-bit builds of SLOT=10 fail due to
having been unable to locate the executable in question. Whatever the
reason for this is, actually looking for llvm-tblgen with
find_program() solves the issue, at least on my system anyway.
Closes: https://bugs.gentoo.org/728804
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch | 11 +++++++++++
dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch b/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch
new file mode 100644
index 00000000000..bf013c33a59
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,7 +137,7 @@
+ set (COMPILE_OPTIONS_TD opencl_clang_options.td)
+ set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
+
+-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
++find_program(LLVM_TABLEGEN_EXE "llvm-tblgen")
+ set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
+ if(USE_PREBUILT_LLVM)
+ set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
index d09e936af38..eaa015b40fe 100644
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
@@ -29,6 +29,7 @@ LLVM_MAX_SLOT=10
PATCHES=(
"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+ "${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
)
multilib_src_configure() {
next reply other threads:[~2020-06-22 20:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 20:57 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-10 13:25 [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/ Conrad Kostecki
2023-05-04 21:49 Conrad Kostecki
2022-04-24 14:41 Michał Górny
2022-01-21 7:08 Joonas Niilola
2021-02-27 14:42 Conrad Kostecki
2021-02-27 14:39 Conrad Kostecki
2019-05-01 16:52 Marek Szuba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1592859357.955640ef357de349e242eca5d7848286a450f35e.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox