From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Aug 2021 08:59:54 +0100 Subject: gentoo resync : 31.08.2021 --- dev-util/intel-graphics-compiler/Manifest | 4 ++ ...s-compiler-1.0.8365-cmake-minimum-version.patch | 43 ++++++++++++ ...-graphics-compiler-1.0.8365-cmake-project.patch | 27 ++++++++ ...el-graphics-compiler-1.0.8365-disable-git.patch | 37 ++++++++++ .../intel-graphics-compiler-1.0.8365-r1.ebuild | 78 ++++++++++++++++++++++ 5 files changed, 189 insertions(+) create mode 100644 dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch create mode 100644 dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch create mode 100644 dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch create mode 100644 dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.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 6092277dbc8c..328934b29ea2 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1,6 +1,9 @@ AUX intel-graphics-compiler-1.0.4111-opencl-clang_version.patch 1567 BLAKE2B cef900deb559e251e7fce91b8b8558e5eff846d5bab0153edb6d01ee29bdd0fd4c8dfcf3f3d732a23c357eebb119a4b833205f6e8526ef612069cec165395bf6 SHA512 984a3f26bd16d2d2db0608338f498ebefbbadb6b75552d3c3eaa0fea3456bf52e5ed0c57bedbd144e1d72bf6dea132fb21fe0d8cbca008ddd6b5456352143942 AUX intel-graphics-compiler-1.0.8173-fix-missing-limits.patch 744 BLAKE2B 61e7fc376d7e5aa197794f8cc7f9cd4fc469ca4a7f0e9463c4d066ad119869da7ce6501d542e3c660326bd6131769534339fbedc18e954c49eb471243c48059c SHA512 c1ca22cb158c2c83e9bc355cc9c9aa4d710877c2431c0d769013e91fe15f6c4245e529de08b889548dcdecec34ce3708a2b976fb9ccd7b4b69e11c066878582d AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc +AUX intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch 1572 BLAKE2B 978ee89e5067a56a168f74b9707307a2f2dc6aedac1521f0494b4891ee269dfceedb06b951d0e0a6bc68d157bca83ed8f3285f770afc7facfe0cf8921a0e4ae8 SHA512 e751206b5a14be92e6bacf2b39cbd87efd462dcba935be028a8b648e4a36870456237b66c361f3ac5481896cd2c1beb145b75708fa6b52219fe3a42e238193ee +AUX intel-graphics-compiler-1.0.8365-cmake-project.patch 774 BLAKE2B 7b117f1acecf2aca35e8ef46725da4e1f4b077e87b06bd99b64504cfb21b2834dc921bbe7cfaebd34ebf864a85506859b3689d5cae76e6506c4d96e4304735dc SHA512 23c754019408cb12e9341545a627847db853c92618c58fba87b295fb4430d077154f20e241f692354dee50e624f008e8b765c60e17339988c04c583f4636a56f +AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d 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 @@ -11,5 +14,6 @@ EBUILD intel-graphics-compiler-1.0.4111.ebuild 1948 BLAKE2B b94c41a2657cb985065e EBUILD intel-graphics-compiler-1.0.4944.ebuild 2492 BLAKE2B 2a41f64fb5ab688815cbfb29c4454eabd645cfa4ae0e852ff6fe41511726dd380843a561ebe4b594971093c51f5ceab8b132d9ac766d980bd6b4a254979f996c SHA512 feaaad5029246bff1faff06c3ba9d7c4afb15be0c31656ebfcb1a9dee7127271599144d5fb118625b034f8bb86970aed83f2acc0822eff01f2791ea74c671785 EBUILD intel-graphics-compiler-1.0.5353.ebuild 2559 BLAKE2B 16d24827231f286999542377531e90d89599ca7c70674be8200c47bc6270412cf6aa548b5a1a0a23968375f3a25060011edd2655a1522b16abf07765ae79763c SHA512 f3d195649693fd25cff7f34762f0b18ab1e5f0c2072b5ebd0bab9b1a69a1f9dcc5bd0ed482010bf7a1b50515dda122343a6dabda464c6ce61ea08511099d1041 EBUILD intel-graphics-compiler-1.0.8173.ebuild 2578 BLAKE2B 65fd7700ebc866e3b8057a8508a052c53b5c2d3902af391378bcbed257cb2ed7ef1120ad8d0f6d708354457983cb9260aa0f4fcb7fed57fbd65fc36c103a03b3 SHA512 e0879fd7e50d11aba0dd3cffc29d9a37676a54fb6272b2b9c74800f3d80768d72c6948902bf211a9eadeabd9fa557b830c23978a30045e7ce9c9fdf2337d9c84 +EBUILD intel-graphics-compiler-1.0.8365-r1.ebuild 2167 BLAKE2B 3a031f63846ac1fae0ae20baef89f0cf7a85c3c7b08409fdf0b9a32b76058eff1ee6ddb1a42d7ad4b4fdde8a5cbec74e75b412482e3dce3d4716c355452e06b6 SHA512 f75bdcea58dabca275db473e5722cfafd08fe466c87225e437f91711be7a84d2679c2e4c022a3b2cbda0d948a4f3817c2eb2551337a0657eaee7e69a391efbae EBUILD intel-graphics-compiler-1.0.8365.ebuild 2587 BLAKE2B 058b83d1ff2045d0f4311ca13af0a335b89a0c22f07196580bbb220fdbda3b176fa3cfd90c46e295650381f3e0a7a81ccf2f5f509476b5c6bcae443e18e6410f SHA512 9ad9c83a8649503d534ad2587642155e5565d6ab09dcf5187f8be1127545b7541f5b59d4c2a5541e82b177cf4155ac90d01bd8cfdeb399d0307fc1f478c53ff9 MISC metadata.xml 593 BLAKE2B 1455f1bc7cbf885041bb672389a9b61da6ab73957369bfe5f1fb368d59ca455b1da7667dc1342c2f227fff14b4d2f86d74397cb71b7180284cbba72491e992ca SHA512 f838d97a156593bea9e81c192a1ea0a8869690fd0e4fb700fdfb0c3dd0af79a41eb58f48bdca45df7a8305f9c74a2cca21b2ec87f92a2d28894743861bbbee18 diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch new file mode 100644 index 000000000000..dcf762872a18 --- /dev/null +++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch @@ -0,0 +1,43 @@ +From 419ae48d0e2cb932a6618e9012b4164e93e58279 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +Date: Sat, 28 Aug 2021 00:16:23 +0200 +Subject: [PATCH] IGC: CMakeLists: adjust minimum_version + +As CMake warns about possible compatibility problems, +the minimum version should be updated, as it should be compatible. + +Otherwise, the warning is printed: +Compatibility with CMake < 2.8.12 will be removed from a future version of CMake. + +Signed-off-by: Conrad Kostecki +--- + visa/CMakeLists.txt | 2 +- + visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt +index c70d80d5726..3e54bd93079 100644 +--- a/visa/CMakeLists.txt ++++ b/visa/CMakeLists.txt +@@ -68,7 +68,7 @@ if(WIN32) + cmake_minimum_required(VERSION 3.1) + cmake_policy(SET CMP0043 OLD) + else() +- cmake_minimum_required(VERSION 2.8) ++ cmake_minimum_required(VERSION 2.8.12) + endif(WIN32) + + # In the case where this is the IGC build we need to add a dummy custom target check_headers +diff --git a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt +index d3011ddae6a..e40313fc194 100644 +--- a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt ++++ b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt +@@ -10,7 +10,7 @@ + if(WIN32) + cmake_minimum_required(VERSION 3.1) + else() +- cmake_minimum_required(VERSION 2.8) ++ cmake_minimum_required(VERSION 2.8.12) + endif(WIN32) + + project(GEDLibrary) diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch new file mode 100644 index 000000000000..92683cdfb942 --- /dev/null +++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch @@ -0,0 +1,27 @@ +From f883dc94360af37ce85c8a9215c861fdc0431dee Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +Date: Sat, 28 Aug 2021 00:09:09 +0200 +Subject: [PATCH] IGC: CMakeLists: add project + +If project is not added, CMake will warn about it: +No project() command is present. The top-level CMakeLists.txt file +must contain a literal, direct call to the project() command. + +Signed-off-by: Conrad Kostecki +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfbcf52eca4..5b04555b21f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ + + cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR) + ++project(IGC) ++ + add_subdirectory(IGC) + + list(APPEND IGC__IGC_TARGETS "igc_dll") diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch new file mode 100644 index 000000000000..4a9a8988c5b4 --- /dev/null +++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch @@ -0,0 +1,37 @@ +From d0f801a178755504c2f8956841823b2aa6a124c4 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +Date: Sat, 28 Aug 2021 00:57:59 +0200 +Subject: [PATCH] IGC: CMakeLists: drop git + +Dropping git, as we don't have any git release. + +Signed-off-by: Conrad Kostecki +--- + visa/iga/IGALibrary/CMakeLists.txt | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/visa/iga/IGALibrary/CMakeLists.txt b/visa/iga/IGALibrary/CMakeLists.txt +index 061476d94..2fd44807c 100644 +--- a/visa/iga/IGALibrary/CMakeLists.txt ++++ b/visa/iga/IGALibrary/CMakeLists.txt +@@ -14,17 +14,6 @@ set(CMAKE_CXX_STANDARD 14) + + ############################################## + # compute the version string from the git repo +-execute_process( +- COMMAND git rev-parse --short HEAD +- OUTPUT_VARIABLE GIT_COMMIT +- OUTPUT_STRIP_TRAILING_WHITESPACE +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +-# +-execute_process( +- COMMAND git diff-index --quiet HEAD -- +- RESULT_VARIABLE GIT_DIRTY +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +- + set(IGA_VERSION_SUFFIX "") + if(GIT_COMMIT) + set(IGA_VERSION_DIRTY_TAG "") +-- +2.33.0 + diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild new file mode 100644 index 000000000000..5f73442c79b4 --- /dev/null +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild @@ -0,0 +1,78 @@ +# 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" +) + +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 +} -- cgit v1.2.3