From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 519E81382C5 for ; Mon, 22 Jun 2020 20:57:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81039E0969; Mon, 22 Jun 2020 20:57:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A965E0969 for ; Mon, 22 Jun 2020 20:57:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 940CC34F27B for ; Mon, 22 Jun 2020 20:57:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1695522B for ; Mon, 22 Jun 2020 20:57:08 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1592859357.955640ef357de349e242eca5d7848286a450f35e.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/, dev-libs/opencl-clang/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/opencl-clang/files/opencl-clang-10.0.0.1_find-llvm-tblgen.patch dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild X-VCS-Directories: dev-libs/opencl-clang/files/ dev-libs/opencl-clang/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 955640ef357de349e242eca5d7848286a450f35e X-VCS-Branch: master Date: Mon, 22 Jun 2020 20:57:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4b0d9a60-5856-4c2e-af2f-750aba1ff896 X-Archives-Hash: 2e2bb91adb8f2d21c1b8c481f0f9c0b2 commit: 955640ef357de349e242eca5d7848286a450f35e Author: Marek Szuba gentoo org> AuthorDate: Mon Jun 22 20:45:03 2020 +0000 Commit: Marek Szuba gentoo 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 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() {