diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-21 14:44:25 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-21 14:44:25 +0100 |
commit | 2480f36bfb3d39469cc44843d1fe664bd40443a3 (patch) | |
tree | 1c57ba55297055b6b0a88830282439b6c6d58d0c /dev-util/spirv-tools | |
parent | 3c54b2473c5fb6fe0fc543b15fc4678471922cb1 (diff) |
gentoo auto-resync : 21:07:2022 - 14:44:25
Diffstat (limited to 'dev-util/spirv-tools')
-rw-r--r-- | dev-util/spirv-tools/Manifest | 3 | ||||
-rw-r--r-- | dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch | 40 | ||||
-rw-r--r-- | dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild | 49 |
3 files changed, 0 insertions, 92 deletions
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index 3b2c92175ad9..e77121bf0086 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,7 +1,4 @@ -AUX spirv-tools-1.3.211-cmake-librt.patch 1611 BLAKE2B 1199d25a4933f0d16875f9d8595ba158d84e5cbd6dadf19349667824da4d9931b6d83b9a571242c323868d5bc369f300f9ee2698da5aa65b764ed0c380fc060b SHA512 18935d1f2b520924a607bea05b4a37b371d908ebe317637fcf3d134ee7986aae1be3a8840b6ec674d9cb3dca932bc0896077b7b0660d5b3c016628cd94a7b0c5 -DIST spirv-tools-1.3.211.tar.gz 2995491 BLAKE2B 545457d097d1e00720a3f97c1f2ed0f27c7b8b6e799ac22c6adbbed7fed17edee27e13c04848db70ee08ac3319ed9a322e22a9288184651f8aa4c03df0ab4057 SHA512 df7de69779baa7ea2269cb4c9813a7d8026763f7d4f7408ea5c160ca7bd670e46e75dcbf9d99ca5f1619f37f504e695d151ede5d5cd0ef675a8898bb297c5842 DIST spirv-tools-1.3.216.tar.gz 3019645 BLAKE2B 88fed3d48f50c50276746dd2b69740482c95c83df13312e081ae4066351454f0a3afaad2f146c629ee39dd34708dd105941e2bc374146a6e9806631227372105 SHA512 85418189962611724488ea61f1b123c55c2f5ab9dd50d028c7ed1ed2965ff23e2679d514e863ac16b60a3c7c6b4fbd05e7c7ff398415e0435d72c96363b95188 -EBUILD spirv-tools-1.3.211-r1.ebuild 1292 BLAKE2B c36af720c73c6cefa3b82cbaf09547c74c943319b252258c41aee64cabb1580c09ab73eb12ea5b72eab6658c41b69d339edc429b9a6f4c67771da63e78232f6d SHA512 d4d38dc7d92183cb1a8c87b842e2abe3f8f8e5068959ec741c57d7bfbbba78e006897842874f3322b1bd5b1d255484bd31c26a49ecc33cc75c284631e099dde9 EBUILD spirv-tools-1.3.216.ebuild 1241 BLAKE2B 702ac48645f31cf208d0ab9a773513ef741cae445007d1a8f41622f57d908b2b86610c12395b69203f258091b91f4686ed1373a667475cee805af1ad1e365aac SHA512 39f18ac3aabafbda41abd01a77c6bd21551793b365e58561eb6f6cc6060d738f951cb407b1e246c0ebfa86d66ce29f8b0d2ea341a8640782d0595b52d2860f7b EBUILD spirv-tools-99999999.ebuild 1249 BLAKE2B dff0362113653bdfddba4889cf457589aabb80f4ca511016e60f5d4e410ab4c8fc61498d158f589c6d88ab070c30f6ba92a8d6b6e72997010e2d017f26a6e2a3 SHA512 c95a42b3a13a8b898f70026ae1021e3cbe0f0df17068431711dba40ef562ddf7aed42194bfa287c1e3a480aa8c8c3f8645195e18d0f29bc7f52a11874a93ec13 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3 diff --git a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch b/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch deleted file mode 100644 index 48afd5a736f1..000000000000 --- a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/KhronosGroup/SPIRV-Tools/commit/cb96abbf7affd986016f17dd09f9f971138a922b - -From: Chad Versace <chad@kiwitree.net> -Date: Thu, 14 Apr 2022 06:04:12 -0700 -Subject: [PATCH] Fix CMake for librt (#4773) - -In the installed file -/usr/lib64/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake, occurences of -librt in the INTERFACE_LINK_LIBRARIES property are incorrect. The -property contains the absolute path to librt. In most situations, this -produces no problem. But when building in a sysroot, which is commonly -done when cross-compiling, the absolute path breaks dependent projects. - -For example, when building spirv-tools using the Chrome OS SDK, and -targeting the board 'volteer', where the build sysroot is -'/build/volteer', the file includes this line - INTERFACE_LINK_LIBRARIES "/build/volteer/usr/lib64/librt.so" -when it should instead say - INTERFACE_LINK_LIBRARIES "rt" - -The CMake documentation agrees [1]: - Note that it is not advisable to populate the - INTERFACE_LINK_LIBRARIES of a target with absolute paths to - dependencies. That would hard-code into installed packages the - library file paths for dependencies as found on the machine the - package was made on. - -[1] https://cmake.org/cmake/help/latest/prop_tgt/INTERFACE_LINK_LIBRARIES.html ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -407,7 +407,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - find_library(LIBRT rt) - if(LIBRT) - foreach(target ${SPIRV_TOOLS_TARGETS}) -- target_link_libraries(${target} ${LIBRT}) -+ target_link_libraries(${target} rt) - endforeach() - endif() - endif() - diff --git a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild deleted file mode 100644 index 246a6fc6ad67..000000000000 --- a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=SPIRV-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml(+)" -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" - inherit git-r3 -else - EGIT_COMMIT="sdk-${PV}.0" - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} -fi - -DESCRIPTION="Provides an API and commands for processing SPIR-V modules" -HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools" - -LICENSE="Apache-2.0" -SLOT="0" -# Tests fail upon finding symbols that do not match a regular expression -# in the generated library. Easily hit with non-standard compiler flags -RESTRICT="test" -COMMON_DEPEND="~dev-util/spirv-headers-${PV}" -DEPEND="${COMMON_DEPEND}" -RDEPEND="" -BDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-cmake-librt.patch -) - -multilib_src_configure() { - local mycmakeargs=( - "-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/" - "-DSPIRV_WERROR=OFF" - "-DSPIRV_TOOLS_BUILD_STATIC=OFF" - "-DBUILD_SHARED_LIBS=ON" - ) - - cmake_src_configure -} |