From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-util/intel-graphics-compiler/Manifest | 7 ++-- ...-for-building-separated-dynamic-llvm-libs.patch | 45 +++++++++++++++++++++ .../intel-graphics-compiler-1.0.2878.ebuild | 36 ----------------- .../intel-graphics-compiler-1.0.2990.ebuild | 36 ----------------- .../intel-graphics-compiler-1.0.3445.ebuild | 46 ++++++++++++++++++++++ 5 files changed, 94 insertions(+), 76 deletions(-) create mode 100644 dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch delete mode 100644 dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2878.ebuild delete mode 100644 dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild create mode 100644 dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild (limited to 'dev-util/intel-graphics-compiler') diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest index 65188847ab26..965aa0448b45 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1,8 +1,7 @@ +AUX intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch 1335 BLAKE2B 6b710f0f02f36bc795c407fd70e4f4ef6931794114f692b16ed48b98547345e60293c1d8d03bddff2db20722e362a4cc9493d36ceb2eb7f4fd8abdffd72b6144 SHA512 4af69610c65be18700f9d14f6d856ea8016fb5b9ed0aae6ad8ca0e0c663fd7ea30779f0b17c61a330edad2b550bea1b723a4a64f5807822252725fbc65adfb98 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d -DIST intel-graphics-compiler-1.0.2878.tar.gz 5920418 BLAKE2B 99522118d08183836c6e62f80c98b2cc716dd22d7dc82d05841e87e42f10025508c6254cebe2f886da8454cc4cc4b3a9ee06ce5a3bc04246c88f499f63f8f1ae SHA512 3b6dc9b945fddb3d0bc716f4598c4dacb6431c342b580c90f7e9ff8682bdcbde410a960adbfd9e67601d121adc70d2cf23de01bc99c1d0cb86d14b4db77afde5 -DIST intel-graphics-compiler-1.0.2990.tar.gz 5930890 BLAKE2B 038761e74dde52de53eed511a74a39d9b4c69a510ef289d2941b859aea018d6776b5179d2be006b12d3245ffe43a06bfacd9d03ee2d227c2ba2ea39805bf40d2 SHA512 65287348e98f09096418afa02262ad6ce07dd918aa040ac1fb49f7176545c0a6449e68c5e74a11c41641d90495edc7be8e24b32e68d798df906ea3b16e675827 DIST intel-graphics-compiler-1.0.3151.tar.gz 5950502 BLAKE2B 8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1 SHA512 a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14 -EBUILD intel-graphics-compiler-1.0.2878.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119 -EBUILD intel-graphics-compiler-1.0.2990.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119 +DIST intel-graphics-compiler-1.0.3445.tar.gz 6026437 BLAKE2B 4a4708109d125891dfe967186efbc2ebe70ce59dc0302f534dad74c0b1f2af36de0d7ee7cb69059e776ab4669236f5d62750159a44d44a6444ab85a205273563 SHA512 044b941adb921b25a1ab6da3ebe0f7c4d67769b43e5b855ae94871281cf387ce45351b8b46a6e98e3bd573022d7cfd9316629d590327c8f4007e1b1ae9f7071e EBUILD intel-graphics-compiler-1.0.3151.ebuild 895 BLAKE2B 9924a3f7db2a7a8e75bdbdbe3d50f42b60c5265ae6e2cb50df52ed860c2178f6a2f00bcac075d5914f47d5e2abd8b7f4fb8e7d2fd06a7aa6d3dcb5d90f91dd6f SHA512 e5d68db8303f165259c399e2d786991ace0628aac5667ac28200d9ba9952c16c23cfb872914cc6e6e4dc00cb9b7bd11b023627f62de5aca661d8bc3de8ecd782 +EBUILD intel-graphics-compiler-1.0.3445.ebuild 1448 BLAKE2B c8175562df6d37f1fddfa760b69fe20a5b1e35ee88493750e659bbdad83b6f4cb3edeadf8f94f0ec47b5f808a04a05f17711ea1ca410d6679dc087d4631b5918 SHA512 00db2187b0869417835a78aec5361df6cf3606ed952b3f3fc51b7a43d027548302723ab02bd613d0dd5f1632c5bd660f208d72b6eb7f1bc6abfffe8d584f646e MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c 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 new file mode 100644 index 000000000000..931ba4437b14 --- /dev/null +++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch @@ -0,0 +1,45 @@ +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.2878.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2878.ebuild deleted file mode 100644 index 03d09a9af2dd..000000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2878.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.0.1: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=8 - ) - cmake-utils_src_configure -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild deleted file mode 100644 index 03d09a9af2dd..000000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.0.1: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=8 - ) - cmake-utils_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 new file mode 100644 index 000000000000..7076388bbd05 --- /dev/null +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild @@ -0,0 +1,46 @@ +# 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 +} -- cgit v1.2.3