commit: 1f593e6c6545c9447d2adc9c03b166b6cd658ce5 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Tue Sep 21 18:05:52 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Sep 21 18:25:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f593e6c
dev-util/intel-graphics-compiler: drop old versions Closes: https://bugs.gentoo.org/774009 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-util/intel-graphics-compiler/Manifest | 4 -- ...cs-compiler-1.0.4111-opencl-clang_version.patch | 27 -------- .../intel-graphics-compiler-1.0.4111.ebuild | 61 ---------------- .../intel-graphics-compiler-1.0.4944.ebuild | 72 ------------------- .../intel-graphics-compiler-1.0.5353.ebuild | 73 ------------------- .../intel-graphics-compiler-1.0.8173.ebuild | 74 -------------------- .../intel-graphics-compiler-1.0.8365.ebuild | 81 ---------------------- .../intel-graphics-compiler-1.0.8517.ebuild | 79 --------------------- 8 files changed, 471 deletions(-) diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest index e7569a94df0..2d2471a91dc 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1,6 +1,2 @@ -DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110 -DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105 SHA512 34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e -DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 34b80b30f33dbd57bcea15852c80cdf8bdbf4630a7904946c7ce84481789e7db42f5216ba14140d445e9b0adbfcfe224468e462ea27768f0e8d31525ce56cde1 SHA512 e9f20e2261c5cb79d365d5d8257e8f4830b2364962c48413cc80154469db34c1c844ae5d576cbce2e3c5e5cbe22c7c3710ebd0a7fe7208e5412e81ce20077c80 -DIST intel-graphics-compiler-1.0.8173.tar.gz 7471884 BLAKE2B 2248a8d5f23d4578c5bd04a799af65767916b3705e16a8145149794a2cf16e5a0e16c21669336151a241cc52e7672b05eb892ac4925f2c2d0b22673af4ebf67f SHA512 bebccee0699dea48e98ddcdb320cacacda0cdcd36b68e51d932791756b0a8e2171a78cc1921ca2a092b9fe7dbd7a783d4898ada08c58bf856dd29bfc08334fa0 DIST intel-graphics-compiler-1.0.8365.tar.gz 7509633 BLAKE2B ffe18d18b409db36bd24215d841daaa36d5055d61b9021e385fe9178351b6a92383839e271a12d1e5017150b9697060fe37f803c5153d2f107813aeb2e7a74cf SHA512 6597afbab2c101d69e6a991b5b065ebbded7ccc6227c0ed82b6b0bd33fec26489c30a0a7a9558617578a767ca6d7382a6ab36144f4c64df742c6bd545ce991e9 DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825 SHA512 35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch deleted file mode 100644 index 8996466275c..00000000000 --- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/IGC/BiFModule/CMakeLists.txt -+++ b/IGC/BiFModule/CMakeLists.txt -@@ -160,20 +160,10 @@ - - if(UNIX) - if(NOT ${CCLANG_BUILD_INTREE_LLVM}) -- # Get common clang library soname -- get_target_property(CCLANG_LIB_PATH opencl-clang-lib "IMPORTED_LOCATION") -- execute_process( -- COMMAND readelf -d ${CCLANG_LIB_PATH} -- OUTPUT_VARIABLE CCLANG_READELF_CALL) -- string(REGEX MATCH "\\[${COMMON_CLANG_LIB_FULL_NAME}\\.([0-9](\\.[0-9]*)*[a-zA-Z0-9]*)\\]" CCLANG_SONAME_VERSION "${CCLANG_READELF_CALL}") -- set(CCLANG_SONAME_VERSION "${CMAKE_MATCH_1}") -- -- # Check if common clang library is newer than 5.0.0 version on which we have SPIR-V support -- if("${CCLANG_SONAME_VERSION}" VERSION_GREATER "5.0.0") -- set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}") -- else() -- message(FATAL_ERROR "[IGC\\BiFModule] : Version ${CCLANG_SONAME_VERSION} of library ${COMMON_CLANG_LIB_FULL_NAME} is below version 5.0.0 (where it's starts support of SPIR-V), please upgrade this library at least to version 5.0.0") -- endif() -+ # Workaround for https://bugs.gentoo.org/739138 : instead of checking -+ # the version of opencl-clang, have ebuilds set CCLANG_SONAME_VERSION -+ # for us. -+ set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}") - endif() - if (NOT CCLANG_FROM_SYSTEM) - install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl) diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild deleted file mode 100644 index 2ce45fda5ad..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild +++ /dev/null @@ -1,61 +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 - -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.4111-opencl-clang_version.patch -) - -S="${WORKDIR}"/${PN}-igc-${PV} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if tc-is-clang && [[ $(clang-major-version) -ge 10 ]] ; then - die "Building IGC with clang-10 and newer is presently not supported (see Bug #738934). Please use clang-9 or gcc instead." - fi - fi -} - -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)" - - # 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 - - local mycmakeargs=( - -DCCLANG_SONAME_VERSION=${llvm_slot} - -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 -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild deleted file mode 100644 index 7651df693d6..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.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 -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild deleted file mode 100644 index 0173f758337..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 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=11 - -# 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. -DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}] - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}] - >=dev-libs/opencl-clang-11.0.0:=[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" - -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}) - local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot}) - llvm_ver=${llvm_ver##*-} - - # 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_ver} - -DIGC_BUILD__VC_ENABLED=no - ) - cmake_src_configure -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild deleted file mode 100644 index dd493717301..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python{3_9,3_10} ) -LLVM_MAX_SLOT=10 - -inherit cmake flag-o-matic llvm python-any-r1 - -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" -S="${WORKDIR}"/${PN}-igc-${PV} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug" - -BDEPEND="${PYTHON_DEPS} - >=sys-devel/lld-${LLVM_MAX_SLOT}" -# 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. -DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:= - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:= - >=dev-libs/opencl-clang-12.0.0:=" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.9-no_Werror.patch" - "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch" - "${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch" -) - -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} -} - -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}) - local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot}) - llvm_ver=${llvm_ver##*-} - - # 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_ver} - -DIGC_BUILD__VC_ENABLED=no - ) - cmake_src_configure -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild deleted file mode 100644 index b504e2949b3..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python{3_9,3_10} ) -LLVM_MAX_SLOT=10 - -inherit cmake flag-o-matic llvm python-any-r1 - -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" -S="${WORKDIR}"/${PN}-igc-${PV} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug" - -BDEPEND=" - ${PYTHON_DEPS} - >=sys-devel/lld-${LLVM_MAX_SLOT} -" - -# 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. -DEPEND=" - <=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:= - <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:= - >=dev-libs/opencl-clang-12.0.0:= -" - -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.9-no_Werror.patch" - "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch" - "${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch" -) - -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} -} - -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}) - local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot}) - llvm_ver=${llvm_ver##*-} - - # 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_ver} - -DIGC_BUILD__VC_ENABLED=no - ) - - cmake_src_configure -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild deleted file mode 100644 index fff9a377a38..00000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_BUILD_TYPE="Release" -LLVM_MAX_SLOT="10" -MY_PN="igc" -MY_P="${MY_PN}-${PV}" -PYTHON_COMPAT=( python3_{8..10} ) - -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}= - sys-devel/llvm:${LLVM_MAX_SLOT}= -" - -RDEPEND="${DEPEND}" - -BDEPEND=" - ${PYTHON_DEPS} - >=sys-devel/lld-${LLVM_MAX_SLOT} -" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.9-no_Werror.patch" - "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch" - "${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch" - "${FILESDIR}/${PN}-1.0.8365-disable-git.patch" - "${FILESDIR}/${PN}-1.0.8365-cmake-project.patch" - "${FILESDIR}/${PN}-1.0.8365-cmake-minimum-version.patch" - "${FILESDIR}/${PN}-1.0.8517-fix-missing-limits.patch" -) - -pkg_setup() { - llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - # 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 for more information. - ! use debug && append-cppflags -DNDEBUG - - local mycmakeargs=( - # Those options are ensuring, that we are using - # the system LLVM with the correct slot. - -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__LLD_MODE="Prebuilds" - -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common" - -DIGC_OPTION__LLVM_MODE="Prebuilds" - -DIGC_OPTION__LLVM_PREFERRED_VERSION="${LLVM_MAX_SLOT}" - - # VectorCompiler needs work, as at the moment upstream - # only supports building vc-intrinsics in place. - -DIGC_BUILD__VC_ENABLED="NO" - - # This will suspress some CMake warnings, - # which cannot be fixed at the moment. - -Wno-dev - ) - - cmake_src_configure -}
