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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9ED2D158094 for ; Sat, 1 Oct 2022 03:12:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03206E09D6; Sat, 1 Oct 2022 03:12:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DAD3CE09D6 for ; Sat, 1 Oct 2022 03:12:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E80C5340FDF for ; Sat, 1 Oct 2022 03:12:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48F74599 for ; Sat, 1 Oct 2022 03:12:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664593924.d247aa7519850a5a67619659b91249892d4b5c41.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ispc/files/ispc-1.18.0-llvm.patch dev-lang/ispc/ispc-1.18.0.ebuild dev-lang/ispc/ispc-9999.ebuild X-VCS-Directories: dev-lang/ispc/ dev-lang/ispc/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d247aa7519850a5a67619659b91249892d4b5c41 X-VCS-Branch: master Date: Sat, 1 Oct 2022 03:12:10 +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: 70b5453d-0561-4465-aef9-11344800b101 X-Archives-Hash: cf59279f3e297d24d4d2d0e005d3740f commit: d247aa7519850a5a67619659b91249892d4b5c41 Author: Sam James gentoo org> AuthorDate: Sat Oct 1 03:11:54 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 1 03:12:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d247aa75 dev-lang/ispc: fix non-9999 patch Closes: https://bugs.gentoo.org/873676 Signed-off-by: Sam James gentoo.org> dev-lang/ispc/files/ispc-1.18.0-llvm.patch | 39 ++++++++++++++++++++++++++++++ dev-lang/ispc/ispc-1.18.0.ebuild | 4 +-- dev-lang/ispc/ispc-9999.ebuild | 4 +-- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dev-lang/ispc/files/ispc-1.18.0-llvm.patch b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch new file mode 100644 index 000000000000..7303ac0fd6e8 --- /dev/null +++ b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13e66268..27ff8364 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -218,7 +218,7 @@ if (WASM_ENABLED) + list(APPEND ISPC_TARGETS wasm-i32x4) + endif() + +-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) ++set(CLANG_LIBRARY_LIST clang clang-cpp) + set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp) + + if (X86_ENABLED) +@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN) + endif() + + # Link against Clang libraries +-foreach(clangLib ${CLANG_LIBRARY_LIST}) +- find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS}) +- list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path}) +-endforeach() +-target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST}) ++find_package(Clang REQUIRED) ++target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST}) + + # Link against LLVM libraries + target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST}) +diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp +index 06fab989..57a7130f 100644 +--- a/src/llvmutil.cpp ++++ b/src/llvmutil.cpp +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #ifdef ISPC_GENX_ENABLED + #include diff --git a/dev-lang/ispc/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild index 47d74e37d160..ec835cb94bdb 100644 --- a/dev-lang/ispc/ispc-1.18.0.ebuild +++ b/dev-lang/ispc/ispc-1.18.0.ebuild @@ -32,8 +32,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-9999-llvm.patch" - "${FILESDIR}"/ispc-1.18.0-curses-cmake.patch + "${FILESDIR}"/${PN}-1.18.0-llvm.patch + "${FILESDIR}"/${PN}-1.18.0-curses-cmake.patch ) pkg_setup() { diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild index 8da425ce2b9c..843faa818262 100644 --- a/dev-lang/ispc/ispc-9999.ebuild +++ b/dev-lang/ispc/ispc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,7 +31,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-9999-llvm.patch" + "${FILESDIR}"/${PN}-9999-llvm.patch ) CMAKE_BUILD_TYPE="RelWithDebInfo"