commit:     daadd49cc676a3cc58089832355df3f37b2d14c3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 22:59:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 23:00:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daadd49c

dev-util/intel-graphics-compiler: pass -U_GLIBCXX_ASSERTIONS for now

Issue is known & WIP upstream.

Bug: https://github.com/intel/intel-graphics-compiler/issues/282
Closes: https://bugs.gentoo.org/893370
Fixes: 2318ae30753d3a6f931f4c0437507a603863e23f
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../intel-graphics-compiler-1.0.12260.1-r2.ebuild  | 89 +++++++++++++++++++++
 .../intel-graphics-compiler-1.0.12504.5-r3.ebuild  | 91 ++++++++++++++++++++++
 .../intel-graphics-compiler-1.0.12812.26-r2.ebuild | 91 ++++++++++++++++++++++
 .../intel-graphics-compiler-1.0.13230.7-r1.ebuild  | 91 ++++++++++++++++++++++
 4 files changed, 362 insertions(+)

diff --git 
a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12260.1-r2.ebuild
 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12260.1-r2.ebuild
new file mode 100644
index 000000000000..3e49da04ee65
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12260.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="14"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen 
graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler";
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+       dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+       dev-util/spirv-tools
+       sys-devel/lld:${LLVM_MAX_SLOT}=
+       sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+       =sys-devel/lld-${LLVM_MAX_SLOT}*
+       ${PYTHON_DEPS}
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+       "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+       "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+       "${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+)
+
+pkg_setup() {
+       llvm_pkg_setup
+       python-any-r1_pkg_setup
+}
+
+src_configure() {
+       # Get LLVM version
+       local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+       local llvm_version="${llvm_version%%-r*}"
+
+       # See https://github.com/intel/intel-graphics-compiler/issues/212
+       append-ldflags -Wl,-z,undefs
+
+       # See bug #893370 and 
https://github.com/intel/intel-graphics-compiler/issues/282
+       append-flags -U_GLIBCXX_ASSERTIONS
+
+       # See https://bugs.gentoo.org/718824
+       ! use debug && append-cppflags -DNDEBUG
+
+       local mycmakeargs=(
+               
-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+               -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+               -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix 
${LLVM_MAX_SLOT})/$(get_libdir)"
+               -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+               -DIGC_OPTION__CLANG_MODE="Prebuilds"
+               -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+               -DIGC_OPTION__LLD_MODE="Prebuilds"
+               -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+               -DIGC_OPTION__LLVM_MODE="Prebuilds"
+               -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+               -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+               -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+               -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+               -DINSTALL_GENX_IR="ON"
+               
-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+               -Wno-dev
+
+               # Compilation with VectorCompiler causes currently a segfault.
+               # See 
https://github.com/intel/intel-graphics-compiler/issues/236
+               -DIGC_BUILD__VC_ENABLED="OFF"
+               # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
+       )
+
+       cmake_src_configure
+}

diff --git 
a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.5-r3.ebuild
 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.5-r3.ebuild
new file mode 100644
index 000000000000..e0cb1dbdbb19
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12504.5-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="14"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen 
graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler";
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+       dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+       dev-util/spirv-tools
+       sys-devel/lld:${LLVM_MAX_SLOT}=
+       sys-devel/llvm:${LLVM_MAX_SLOT}=
+       vc? (
+               <dev-libs/intel-vc-intrinsics-0.11.0
+               dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+       )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+       =sys-devel/lld-${LLVM_MAX_SLOT}*
+       ${PYTHON_DEPS}
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+       "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+       "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+       "${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+       "${FILESDIR}/${PN}-1.0.12504.5-vectorcompiler.patch"
+)
+
+pkg_setup() {
+       llvm_pkg_setup
+       python-any-r1_pkg_setup
+}
+
+src_configure() {
+       # Get LLVM version
+       local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+       local llvm_version="${llvm_version%%-r*}"
+
+       # See https://github.com/intel/intel-graphics-compiler/issues/212
+       append-ldflags -Wl,-z,undefs
+
+       # See bug #893370 and 
https://github.com/intel/intel-graphics-compiler/issues/282
+       append-flags -U_GLIBCXX_ASSERTIONS
+
+       # See https://bugs.gentoo.org/718824
+       ! use debug && append-cppflags -DNDEBUG
+
+       local mycmakeargs=(
+               
-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+               -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+               -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix 
${LLVM_MAX_SLOT})/$(get_libdir)"
+               -DIGC_BUILD__VC_ENABLED="$(usex vc)"
+               -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+               -DIGC_OPTION__CLANG_MODE="Prebuilds"
+               -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+               -DIGC_OPTION__LLD_MODE="Prebuilds"
+               -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+               -DIGC_OPTION__LLVM_MODE="Prebuilds"
+               -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+               -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+               -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+               -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+               $(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+               -DINSTALL_GENX_IR="ON"
+               
-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+               -Wno-dev
+       )
+
+       cmake_src_configure
+}

diff --git 
a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12812.26-r2.ebuild
 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12812.26-r2.ebuild
new file mode 100644
index 000000000000..9b6b516fc6d3
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12812.26-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="14"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen 
graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler";
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+       dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+       dev-util/spirv-tools
+       sys-devel/lld:${LLVM_MAX_SLOT}=
+       sys-devel/llvm:${LLVM_MAX_SLOT}=
+       vc? (
+               >=dev-libs/intel-vc-intrinsics-0.11.0
+               dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+       )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+       =sys-devel/lld-${LLVM_MAX_SLOT}*
+       ${PYTHON_DEPS}
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+       "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+       "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+       "${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+       "${FILESDIR}/${PN}-1.0.12504.5-vectorcompiler.patch"
+)
+
+pkg_setup() {
+       llvm_pkg_setup
+       python-any-r1_pkg_setup
+}
+
+src_configure() {
+       # Get LLVM version
+       local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+       local llvm_version="${llvm_version%%-r*}"
+
+       # See https://github.com/intel/intel-graphics-compiler/issues/212
+       append-ldflags -Wl,-z,undefs
+
+       # See bug #893370 and 
https://github.com/intel/intel-graphics-compiler/issues/282
+       append-flags -U_GLIBCXX_ASSERTIONS
+
+       # See https://bugs.gentoo.org/718824
+       ! use debug && append-cppflags -DNDEBUG
+
+       local mycmakeargs=(
+               
-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+               -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+               -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix 
${LLVM_MAX_SLOT})/$(get_libdir)"
+               -DIGC_BUILD__VC_ENABLED="$(usex vc)"
+               -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+               -DIGC_OPTION__CLANG_MODE="Prebuilds"
+               -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+               -DIGC_OPTION__LLD_MODE="Prebuilds"
+               -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+               -DIGC_OPTION__LLVM_MODE="Prebuilds"
+               -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+               -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+               -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+               -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+               $(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+               -DINSTALL_GENX_IR="ON"
+               
-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+               -Wno-dev
+       )
+
+       cmake_src_configure
+}

diff --git 
a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
new file mode 100644
index 000000000000..b6627fa95adc
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="14"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen 
graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler";
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+       dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+       dev-util/spirv-tools
+       sys-devel/lld:${LLVM_MAX_SLOT}=
+       sys-devel/llvm:${LLVM_MAX_SLOT}=
+       vc? (
+               >=dev-libs/intel-vc-intrinsics-0.11.0
+               dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+       )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+       =sys-devel/lld-${LLVM_MAX_SLOT}*
+       ${PYTHON_DEPS}
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+       "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+       "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+       "${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+       "${FILESDIR}/${PN}-1.0.13230.7-spirv-tools.patch"
+)
+
+pkg_setup() {
+       llvm_pkg_setup
+       python-any-r1_pkg_setup
+}
+
+src_configure() {
+       # Get LLVM version
+       local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+       local llvm_version="${llvm_version%%-r*}"
+
+       # See https://github.com/intel/intel-graphics-compiler/issues/212
+       append-ldflags -Wl,-z,undefs
+
+       # See bug #893370 and 
https://github.com/intel/intel-graphics-compiler/issues/282
+       append-flags -U_GLIBCXX_ASSERTIONS
+
+       # See https://bugs.gentoo.org/718824
+       ! use debug && append-cppflags -DNDEBUG
+
+       local mycmakeargs=(
+               
-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+               -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+               -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix 
${LLVM_MAX_SLOT})/$(get_libdir)"
+               -DIGC_BUILD__VC_ENABLED="$(usex vc)"
+               -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+               -DIGC_OPTION__CLANG_MODE="Prebuilds"
+               -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+               -DIGC_OPTION__LLD_MODE="Prebuilds"
+               -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+               -DIGC_OPTION__LLVM_MODE="Prebuilds"
+               -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+               -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+               -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+               -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+               $(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+               -DINSTALL_GENX_IR="ON"
+               
-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+               -Wno-dev
+       )
+
+       cmake_src_configure
+}

Reply via email to