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 3496013835A for ; Fri, 19 Jun 2020 14:31:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59627E089B; Fri, 19 Jun 2020 14:31:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5A3A7E088B for ; Fri, 19 Jun 2020 14:31:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 08C2A34F3AC for ; Fri, 19 Jun 2020 14:31:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E87B2AB for ; Fri, 19 Jun 2020 14:31:51 +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: <1592577077.3498f8461cc1879a984a214d85d59f47284b64b2.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.3445-Fix-for-building-separated-dynamic-llvm-libs.patch dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.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: 3498f8461cc1879a984a214d85d59f47284b64b2 X-VCS-Branch: master Date: Fri, 19 Jun 2020 14:31:51 +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: 80ecda77-1c2c-45b2-b612-d5fbb6c6df0c X-Archives-Hash: 8a16b55dbefd33dd148373344cc2b06a commit: 3498f8461cc1879a984a214d85d59f47284b64b2 Author: Marek Szuba gentoo org> AuthorDate: Fri Jun 19 14:18:28 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri Jun 19 14:31:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3498f846 dev-util/intel-graphics-compiler: remove old Signed-off-by: Marek Szuba gentoo.org> dev-util/intel-graphics-compiler/Manifest | 2 - ...-for-building-separated-dynamic-llvm-libs.patch | 45 --------------------- .../intel-graphics-compiler-1.0.3151.ebuild | 37 ----------------- .../intel-graphics-compiler-1.0.3445.ebuild | 46 ---------------------- 4 files changed, 130 deletions(-) diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest index 68760404638..730ba542638 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1,4 +1,2 @@ -DIST intel-graphics-compiler-1.0.3151.tar.gz 5950502 BLAKE2B 8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1 SHA512 a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14 -DIST intel-graphics-compiler-1.0.3445.tar.gz 6026437 BLAKE2B 4a4708109d125891dfe967186efbc2ebe70ce59dc0302f534dad74c0b1f2af36de0d7ee7cb69059e776ab4669236f5d62750159a44d44a6444ab85a205273563 SHA512 044b941adb921b25a1ab6da3ebe0f7c4d67769b43e5b855ae94871281cf387ce45351b8b46a6e98e3bd573022d7cfd9316629d590327c8f4007e1b1ae9f7071e DIST intel-graphics-compiler-1.0.3826.tar.gz 6007014 BLAKE2B fc09d6443818403bca803f3f78fbb9ee9a25ab674372585b880e038227712f8114ca2b17d6b219149f54f9f5856b973d3500f6537027660d1c657d61992f9e9b SHA512 e4f06d6b8d2a7161f80956a8e9cbf23aa7293a31781405bc17ee512d27ca4114facc6bb0fa7f47fde3a37aa79ce288a98aef8b74c4e572e73d70bb50c21f6fbb DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110 diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch deleted file mode 100644 index 931ba4437b1..00000000000 --- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5a07111005b570875da8796f91b385edc483c0da Mon Sep 17 00:00:00 2001 -From: "Wesierski, Lukasz" -Date: Mon, 24 Feb 2020 05:27:13 -0800 -Subject: [PATCH] Fix for building separated dynamic llvm libs - -Change-Id: I3796e7a925e32bfee2dfda60fbaa3f21122e62cb ---- - IGC/CMakeLists.txt | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt -index 8634c456..891a3f5b 100644 ---- a/IGC/CMakeLists.txt -+++ b/IGC/CMakeLists.txt -@@ -82,7 +82,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE) - - # ================================================ Flags =============================================== - -- - # Escapes text for regular expressions. - # - # @param retValName Name of variable placeholder where result will be returned. -@@ -3309,12 +3308,18 @@ else() - "LLVMDemangle" - ) - -- if(LLVM_VERSION_MAJOR EQUAL 8) -+ if(LLVM_VERSION_MAJOR GREATER_EQUAL 8) - list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK - "LLVMInstCombine" - ) - endif() - -+ if(LLVM_VERSION_MAJOR GREATER_EQUAL 9) -+ list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK -+ "LLVMBitstreamReader" -+ ) -+ endif() -+ - endif() - - # ==================================== WrapperLLVM package ============================================= --- -2.24.1 - diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild deleted file mode 100644 index b6771efb82c..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild +++ /dev/null @@ -1,37 +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 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" - -COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}] - dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]" -DEPEND="${COMMON}" -RDEPEND="${COMMON}" - -LLVM_MAX_SLOT=8 - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch -) - -S="${WORKDIR}"/${PN}-igc-${PV} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir) - -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON - -DIGC_PREFERRED_LLVM_VERSION=${LLVM_MAX_SLOT} - ) - cmake_src_configure -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild deleted file mode 100644 index 7076388bbd0..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild +++ /dev/null @@ -1,46 +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 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" - -LLVM_MAX_SLOT=9 - -COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}] - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]" -DEPEND="${COMMON}" -RDEPEND="${COMMON}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch - "${FILESDIR}"/${PN}-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch -) - -S="${WORKDIR}"/${PN}-igc-${PV} - -multilib_src_configure() { - # 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" - local llvm_slot=$(ver_cut 5 $ocl_clang_ver) - # opencl-clang brings the right slot as dep - has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)" - einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)" - - local mycmakeargs=( - -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir) - -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON - -DIGC_PREFERRED_LLVM_VERSION=${llvm_slot} - ) - cmake_src_configure -}