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 5D681138359 for ; Sun, 13 Sep 2020 22:45:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 887C7E0863; Sun, 13 Sep 2020 22:45:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 5CE80E0863 for ; Sun, 13 Sep 2020 22:45:13 +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 A5E66335C97 for ; Sun, 13 Sep 2020 22:45:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 363DA357 for ; Sun, 13 Sep 2020 22:45:10 +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: <1600037102.67763d93882a3d7670c7f8b65588e13aa2b01164.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/intel-graphics-compiler/Manifest dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4427-noVC_TranslateBuild_retval.patch dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4427.ebuild X-VCS-Directories: dev-util/intel-graphics-compiler/files/ dev-util/intel-graphics-compiler/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 67763d93882a3d7670c7f8b65588e13aa2b01164 X-VCS-Branch: master Date: Sun, 13 Sep 2020 22:45: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: 7f514632-17f7-4ba1-b2cf-9f9401895a89 X-Archives-Hash: e0454a77ee0bf18aed198f89410d6ecc commit: 67763d93882a3d7670c7f8b65588e13aa2b01164 Author: Marek Szuba gentoo org> AuthorDate: Sun Sep 13 22:42:36 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Sun Sep 13 22:45:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67763d93 Revert "dev-util/intel-graphics-compiler: bump to 1.0.4427" It might _build_ fine without VC but it still causes intel-neo to fail to compile. This reverts commit a8e3b1a013be805fff6aa076d62c32f3be86fa9b. Signed-off-by: Marek Szuba gentoo.org> dev-util/intel-graphics-compiler/Manifest | 1 - ...piler-1.0.4427-noVC_TranslateBuild_retval.patch | 11 ---- .../intel-graphics-compiler-1.0.4427.ebuild | 72 ---------------------- 3 files changed, 84 deletions(-) diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest index b1dc0c1dfbf..bb330148e01 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1,2 +1 @@ DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110 -DIST intel-graphics-compiler-1.0.4427.tar.gz 6454774 BLAKE2B 283575b301862114f88d1067c8dddec13694cf6a48d335d83434f47a6e95164df9b5ac4385446472ce2b454244308f63b57d7bb3cadfc8acff9472fc48dca2f9 SHA512 902aa15cf1b8d1760cf9b4d35848b37c2296601625e1f123f9a059c9a87d80e851525e3d943facf14e011cf82670057dbad3f75774d6dbf5b6cd52b55669ed3c diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4427-noVC_TranslateBuild_retval.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4427-noVC_TranslateBuild_retval.patch deleted file mode 100644 index 8822fc54e74..00000000000 --- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4427-noVC_TranslateBuild_retval.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/IGC/AdaptorOCL/dllInterfaceCompute.cpp -+++ b/IGC/AdaptorOCL/dllInterfaceCompute.cpp -@@ -1570,7 +1570,7 @@ - { - #if IGC_VC_DISABLED - SetErrorMessage("IGC VC explicitly disabled in build", *pOutputArgs); -- return false; -+ return std::error_code(1, std::generic_category()); - #else - - llvm::StringRef ApiOptions{pInputArgs->pOptions, pInputArgs->OptionsSize}; diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4427.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4427.ebuild deleted file mode 100644 index 95942f84f47..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4427.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake - -inherit cmake-multilib flag-o-matic llvm - -DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware" -HOMEPAGE="https://github.com/intel/intel-graphics-compiler" -SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug" - -LLVM_MAX_SLOT=10 - -# Yes, the last dependency does effectively force the use of llvm-10 -# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg -# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics -# (which we'll need soon as well) at all either we are limited to llvm-10 anyway. -COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}] - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}] - >=dev-libs/opencl-clang-10.0.0.2:=[${MULTILIB_USEDEP}]" -DEPEND="${COMMON}" -RDEPEND="${COMMON}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch - "${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch - "${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch -) - -S="${WORKDIR}"/${PN}-igc-${PV} - -find_best_llvm_slot() { - local candidate_slot - - # Select the same slot as the best opencl-clang - local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)" - einfo "Selecting ${ocl_clang_ver}" - candidate_slot=$(ver_cut 5 ${ocl_clang_ver}) - - # Sanity check - opencl-clang brings the right LLVM slot as its - # dependency so if this is missing, something is very wrong. - has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})" - - echo ${candidate_slot} -} - -multilib_src_configure() { - local llvm_slot=$(find_best_llvm_slot) - einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})" - local llvm_prefix=$(get_llvm_prefix ${llvm_slot}) - - # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way - # IGC uses this definition causes problems for some users (see Bug #718824). - use debug || append-cppflags -DNDEBUG - - # VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place. - local mycmakeargs=( - -DCCLANG_SONAME_VERSION=${llvm_slot} - -DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir) - -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON - -DIGC_PREFERRED_LLVM_VERSION=${llvm_slot} - -DIGC_BUILD__VC_ENABLED=no - ) - cmake_src_configure -}