Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/
Date: Sun, 01 May 2022 19:53:50
Message-Id: 1651434816.d52666486cf6c2fa7ffaa9ee3ad8f3f449275213.sam@gentoo
1 commit: d52666486cf6c2fa7ffaa9ee3ad8f3f449275213
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 29 10:35:19 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 19:53:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5266648
7
8 dev-util/intel-graphics-compiler: force LLVM12 instead LLVM13
9
10 Compiling with LLVM13 causes currently segfaults.
11 See https://github.com/intel/intel-graphics-compiler/issues/204
12
13 Closes: https://bugs.gentoo.org/837872
14 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 ...=> intel-graphics-compiler-1.0.10778-r2.ebuild} | 7 +-
18 ...=> intel-graphics-compiler-1.0.10988-r1.ebuild} | 7 +-
19 .../intel-graphics-compiler-1.0.11061.ebuild | 86 ----------------------
20 3 files changed, 4 insertions(+), 96 deletions(-)
21
22 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r2.ebuild
23 similarity index 95%
24 rename from dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
25 rename to dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r2.ebuild
26 index 78d2327a49ee..6c079df6172d 100644
27 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
28 +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r2.ebuild
29 @@ -4,7 +4,7 @@
30 EAPI=8
31
32 CMAKE_BUILD_TYPE="Release"
33 -LLVM_MAX_SLOT="13"
34 +LLVM_MAX_SLOT="12"
35 MY_PN="igc"
36 MY_P="${MY_PN}-${PV}"
37 PYTHON_COMPAT=( python3_{8..10} )
38 @@ -72,15 +72,12 @@ src_configure() {
39 -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
40 -DINSTALL_GENX_IR="ON"
41 -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
42 + -Wno-dev
43
44 # Compilation with VectorCompiler causes currently a segfault.
45 # See https://github.com/intel/intel-graphics-compiler/issues/236
46 -DIGC_BUILD__VC_ENABLED="OFF"
47 # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
48 -
49 - # This will suspress some CMake warnings,
50 - # which cannot be fixed at the moment.
51 - -Wno-dev
52 )
53
54 cmake_src_configure
55
56 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988-r1.ebuild
57 similarity index 95%
58 rename from dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988.ebuild
59 rename to dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988-r1.ebuild
60 index fc02ff9997b0..e6c00047ccc6 100644
61 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988.ebuild
62 +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988-r1.ebuild
63 @@ -4,7 +4,7 @@
64 EAPI=8
65
66 CMAKE_BUILD_TYPE="Release"
67 -LLVM_MAX_SLOT="13"
68 +LLVM_MAX_SLOT="12"
69 MY_PN="igc"
70 MY_P="${MY_PN}-${PV}"
71 PYTHON_COMPAT=( python3_{8..10} )
72 @@ -71,15 +71,12 @@ src_configure() {
73 -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
74 -DINSTALL_GENX_IR="ON"
75 -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
76 + -Wno-dev
77
78 # Compilation with VectorCompiler causes currently a segfault.
79 # See https://github.com/intel/intel-graphics-compiler/issues/236
80 -DIGC_BUILD__VC_ENABLED="OFF"
81 # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
82 -
83 - # This will suspress some CMake warnings,
84 - # which cannot be fixed at the moment.
85 - -Wno-dev
86 )
87
88 cmake_src_configure
89
90 diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11061.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11061.ebuild
91 deleted file mode 100644
92 index fc02ff9997b0..000000000000
93 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11061.ebuild
94 +++ /dev/null
95 @@ -1,86 +0,0 @@
96 -# Copyright 1999-2022 Gentoo Authors
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=8
100 -
101 -CMAKE_BUILD_TYPE="Release"
102 -LLVM_MAX_SLOT="13"
103 -MY_PN="igc"
104 -MY_P="${MY_PN}-${PV}"
105 -PYTHON_COMPAT=( python3_{8..10} )
106 -
107 -inherit cmake flag-o-matic llvm python-any-r1
108 -
109 -DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
110 -HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
111 -SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
112 -S="${WORKDIR}/${PN}-${MY_P}"
113 -
114 -LICENSE="MIT"
115 -SLOT="0"
116 -KEYWORDS="~amd64"
117 -IUSE="debug"
118 -
119 -DEPEND="
120 - dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
121 - dev-util/spirv-tools
122 - =sys-devel/lld-${LLVM_MAX_SLOT}*
123 - sys-devel/llvm:${LLVM_MAX_SLOT}=
124 -"
125 -
126 -RDEPEND="${DEPEND}"
127 -
128 -BDEPEND="
129 - =sys-devel/lld-${LLVM_MAX_SLOT}*
130 - ${PYTHON_DEPS}
131 -"
132 -
133 -PATCHES=(
134 - "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
135 - "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
136 - "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
137 -)
138 -
139 -pkg_setup() {
140 - llvm_pkg_setup
141 - python-any-r1_pkg_setup
142 -}
143 -
144 -src_configure() {
145 - # Get LLVM version
146 - local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
147 -
148 - # See https://github.com/intel/intel-graphics-compiler/issues/212
149 - append-ldflags -Wl,-z,undefs
150 -
151 - # See https://bugs.gentoo.org/718824
152 - ! use debug && append-cppflags -DNDEBUG
153 -
154 - local mycmakeargs=(
155 - -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
156 - -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
157 - -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
158 - -DIGC_OPTION__CLANG_MODE="Prebuilds"
159 - -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
160 - -DIGC_OPTION__LLD_MODE="Prebuilds"
161 - -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
162 - -DIGC_OPTION__LLVM_MODE="Prebuilds"
163 - -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
164 - -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
165 - -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
166 - -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
167 - -DINSTALL_GENX_IR="ON"
168 - -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
169 -
170 - # Compilation with VectorCompiler causes currently a segfault.
171 - # See https://github.com/intel/intel-graphics-compiler/issues/236
172 - -DIGC_BUILD__VC_ENABLED="OFF"
173 - # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
174 -
175 - # This will suspress some CMake warnings,
176 - # which cannot be fixed at the moment.
177 - -Wno-dev
178 - )
179 -
180 - cmake_src_configure
181 -}
Report Message
Find on MARC Find on Google Groups