commit: 955851505c0c5538d143422cc5e65aca280df338 Author: Denis Reva <denis7774 <AT> gmail <DOT> com> AuthorDate: Wed Nov 16 17:03:06 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Nov 16 17:03:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=95585150
media-libs/amdvlk: updated to 2022.4.2 Reduced installation time Fixed warning about installation directory Closes: https://bugs.gentoo.org/878803 Closes: https://bugs.gentoo.org/784548 Closes: https://bugs.gentoo.org/872461 Signed-off-by: Denis Reva <denis7774 <AT> gmail.com> media-libs/amdvlk/Manifest | 10 +- ...dvlk-2022.4.1.ebuild => amdvlk-2022.4.2.ebuild} | 32 ++- .../files/amdvlk-2022.4.2-license-path.patch | 13 + ...2022.4.2-reduced-llvm-installations-part2.patch | 175 ++++++++++++ ...mdvlk-2022.4.2-reduced-llvm-installations.patch | 309 +++++++++++++++++++++ 5 files changed, 519 insertions(+), 20 deletions(-) diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest index e8d73899c..0e8875ec9 100644 --- a/media-libs/amdvlk/Manifest +++ b/media-libs/amdvlk/Manifest @@ -1,7 +1,7 @@ DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9 -DIST amdvlk-gpurt-2874e509b677d78ddb3faae90989dd45e60669b3.tar.gz 281182 BLAKE2B c6642db52268b76d8c9cb4e140d28f84ed402ec7b3f83e1c5ec716efcdba00ed565312913ad342edd3520f5b17195b36696e3074059c0c509a9afcfd9ccd4d24 SHA512 08c410d0c9478b76947537f84b3a91f8598412765aee30a883f974e3475a3e336f19a9063c762fccdd2970dec60cff9af045d0c9c330ea484a8503b75b543c3f -DIST amdvlk-llpc-9db0ba4c968bbfe2f3e7e546d17cbfd07dcfdc9e.tar.gz 2472851 BLAKE2B 1341d1de88d09f6f46c00b78a0871fb793896c4193aea4ec5ad1464e376940fceac288a4d7358d6fe5521a11dfdab4edb3b6d7b85f9d2e9b7e3e6de449d5a179 SHA512 fe417bda2177273b8d42232b39cb5d99b5d115686e555e904d2914204f9fff0637c91d1ddedc5433402fc7e584d8b5d7e435fe828895281e43d7bc5848109daf -DIST amdvlk-llvm-project-d2b67605e4dd5dc50d0afbeb4f20f29cce97b207.tar.gz 167636626 BLAKE2B 23152ac9f5548847bd4109f1da25642f30dece0f482cfd7ab1c89d1623f0bb57b0b47915a4eb82d307b33a14b1023af6593d16fa7fd751bbbc4907b6554c7fbb SHA512 4681d3f49ef66863df46387ca021dfe2f77750528a90d3f6f709919f56a6b783ffd095a7442a30f83a4168381e8fc088190341944e4bc2d080cbfb274606b772 -DIST amdvlk-pal-c2af6fc4c14ea61273bcf5576f8a83a12b945dd7.tar.gz 11242034 BLAKE2B d72b31a2d6606e9fee7a505203343df8a7712ee97caa1c828f2e7f4d7a96fc47e95d9695d8f0e4749fc9c3a092b17deca21abec6b7b52c0430a02855abf44bdb SHA512 ee4a8686df45bebe9ab8f745694a51f6f1f71aa1c4b7699fafe0ad86fa5eb374832f7be59aff3fd2f0d29b6b1367ecb0d8658e8f110ec06972d528af88acc9dc -DIST amdvlk-xgl-8a67c76eedb8400fb5d3b1e7b6a3894efdc7a3b9.tar.gz 1196792 BLAKE2B f59f2a020793c40c2082fb8ebc461f03b6d0ffd18a2c3eddf961e674e590ed8026d09d5bd142ed7ebcca8e18b26c8dc282b4f7ce7d2387896559e1de70c81f4c SHA512 294f8bdf87bc0b479b108def31672f29557a145c268089959a4825eeecd593a56e7c5943ff3959b3cf98037b4583fde99a9b04dcaf7a940cb75f3486a419ef48 +DIST amdvlk-gpurt-889dd8db7228814a530f0a897ae1ce35543f4662.tar.gz 293078 BLAKE2B 18efc22b0467bd8756e7746169ebd7e7816821c89fe33a04a7d495101fcea136ab6d379d037741f353a5707d4c5f9e2a80a589a009882d380234b23d767cd089 SHA512 ed49a3c88d8e8d91f8e2d733d060a4999051b4fc79ec3b5224c88de32f586e913ea76a48c9fe09acdbacb5be933ab0bac07c321034b0a5703605379b85e11e74 +DIST amdvlk-llpc-83e59f978821ce09390b25838b6684fc11b04774.tar.gz 2489526 BLAKE2B b9f595245a43cee0499c5dc49abb1071844c9f018b6bd7073fda7942c3ba876eb5c37e130118de95a9acff83064f75db6f39d238e439e75ca5611990b5de0ae1 SHA512 45857a3bf658a98675c81ca29061dd77736e44660a643438aca71e1752104a8c318cb0c96152d9203e740e62278ad74b3e084117f2a7ddc65e43278470e59ffc +DIST amdvlk-llvm-project-3c87d1ffe0dbaa60927d428afe3a4a2b3352c31b.tar.gz 167640231 BLAKE2B 15199760d50db4af5925f47ffdd4cb13b891cd76becd81dd96d0dbbb5785176ea7d272d12949d9446eccf1dc774150af04379586931e2b9b4faa1d6743cb265f SHA512 bd790236238fd068a7e7d438803ab307df34297f6aeff10c07dde43c6f51e582a92f0f084531f8f5c16e8cc52927ec67e8349eebf836e8cf295a22430aaf46a3 +DIST amdvlk-pal-0f44ced5384c66d77df3dca1116c7daf7ccfdae5.tar.gz 11305484 BLAKE2B 774310e4b5d839ec1415340377c45b31fc60fde56250e9a2097ef0bbf1940a59b901a692215e28a7200cefa80b075b2e11882fe21b550f1e3edfebad203c28d3 SHA512 f96b79f3be4e5d0b82be7a37bfe546a2db466a92e9eb59053582b3b12a846fe737cd6e01a4d4725ef016611d850cb70b81fb478343b6d7b49832091f10f1e2b1 +DIST amdvlk-xgl-0387177d6143533c88ff0d5ac045bf3994ee618b.tar.gz 1216290 BLAKE2B 30d0914538562ca923216a14be2b54f6d065c0a9f03bdaa11e163bf8c0e3499fdff79aaf6e0495e9d0dd12af526627447781259694e93cf4dab2712b0e1be623 SHA512 6531d1649a09d4f59ce70e8f0f7f9075585c86e5a0053038c6e11c6d9df77ec1dbc2ec12c67dd4e250911faf6d1701f30665c96b18b56bd247f2381c82991550 diff --git a/media-libs/amdvlk/amdvlk-2022.4.1.ebuild b/media-libs/amdvlk/amdvlk-2022.4.2.ebuild similarity index 83% rename from media-libs/amdvlk/amdvlk-2022.4.1.ebuild rename to media-libs/amdvlk/amdvlk-2022.4.2.ebuild index 92d00b81a..bc6f408f9 100644 --- a/media-libs/amdvlk/amdvlk-2022.4.1.ebuild +++ b/media-libs/amdvlk/amdvlk-2022.4.2.ebuild @@ -19,7 +19,9 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) ${BUNDLED_LLVM_DEPEND} - >=dev-util/vulkan-headers-1.3.224" + >=dev-util/vulkan-headers-1.3.224 + dev-util/DirectXShaderCompiler + dev-util/glslang[${MULTILIB_USEDEP}]" BDEPEND="${BUNDLED_LLVM_DEPEND} ${PYTHON_DEPS} dev-util/cmake @@ -30,8 +32,7 @@ RDEPEND=" ${DEPEND} x11-libs/libxcb[${MULTILIB_USEDEP}] x11-libs/libxshmfence[${MULTILIB_USEDEP}] >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}] - dev-util/glslang[${MULTILIB_USEDEP}] - dev-util/DirectXShaderCompiler" + dev-util/glslang[${MULTILIB_USEDEP}]" CHECKREQS_MEMORY="16G" CHECKREQS_DISK_BUILD="4G" @@ -44,11 +45,11 @@ FETCH_URI="https://github.com/GPUOpen-Drivers"; ##and place commits in the desired variables ## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07" ## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..." -XGL_COMMIT="8a67c76eedb8400fb5d3b1e7b6a3894efdc7a3b9" -PAL_COMMIT="c2af6fc4c14ea61273bcf5576f8a83a12b945dd7" -LLPC_COMMIT="9db0ba4c968bbfe2f3e7e546d17cbfd07dcfdc9e" -GPURT_COMMIT="2874e509b677d78ddb3faae90989dd45e60669b3" -LLVM_PROJECT_COMMIT="d2b67605e4dd5dc50d0afbeb4f20f29cce97b207" +XGL_COMMIT="0387177d6143533c88ff0d5ac045bf3994ee618b" +PAL_COMMIT="0f44ced5384c66d77df3dca1116c7daf7ccfdae5" +LLPC_COMMIT="83e59f978821ce09390b25838b6684fc11b04774" +GPURT_COMMIT="889dd8db7228814a530f0a897ae1ce35543f4662" +LLVM_PROJECT_COMMIT="3c87d1ffe0dbaa60927d428afe3a4a2b3352c31b" METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3" CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026" # end of variables @@ -63,6 +64,9 @@ ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_CO PATCHES=( "${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821 "${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch" + "${FILESDIR}/amdvlk-2022.4.2-license-path.patch" #878803 + "${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations.patch" + "${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch" ) src_prepare() { @@ -86,6 +90,9 @@ multilib_src_configure() { -DLLVM_HOST_TRIPLE="${CHOST}" -DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs -DPython3_EXECUTABLE="${PYTHON}" + -DPACKAGE_VERSION="${PV}" + -DPACKAGE_NAME="${PN}" + -DLLVM_INSTALL_TOOLCHAIN_ONLY=On #Disable installation of various LLVM parts which we had to clean up. -Wno-dev ) cmake_src_configure @@ -97,15 +104,10 @@ multilib_check_headers() { multilib_src_install_all() { default einfo "Removing unused LLVM parts…" - rm "${D}"/usr/lib/libLLVM*.a || die "Can't remove unused LLVM static libs" rm "${D}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library" - rm "${D}"/usr/lib/libRemarks* || die "Can't remove unused LLVM lto library" - rm -r "${D}"/usr/share/opt-viewer || "Can't remove unused LLVM opt-viewer" - rm -r "${D}"/usr/include || die "Can't remove unused include folder" + rm "${D}"/usr/lib/libRemarks* || die "Can't remove unused LLVM libRemarks library" rm -r "${D}"/usr/lib/cmake || die "Can't remove unused LLVM cmake folder" - einfo "Removal done! Moving docs…" - mv "${D}"/usr/share/doc/amdvlk/* "${D}"/usr/share/doc/"amdvlk-${PV}"/ || ewarn "Can't move docs. It is not fatal" - einfo "Done!" + einfo "Removal done" } pkg_postinst() { diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch new file mode 100644 index 000000000..9fd590190 --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch @@ -0,0 +1,13 @@ +diff --git a/xgl/cmake/XglPackaging.cmake b/xgl/cmake/XglPackaging.cmake +index a3375293d..14d951b69 100644 +--- a/xgl/cmake/XglPackaging.cmake ++++ b/xgl/cmake/XglPackaging.cmake +@@ -128,7 +128,7 @@ function(generateInstallTargets) + install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/icd.d) + install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/implicit_layer.d) + if(EXISTS ${CMAKE_SOURCE_DIR}/LICENSE.txt) +- install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}) ++ install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}) + else() + message(WARNING "LICENSE.txt is not found under ${CMAKE_SOURCE_DIR}, please put it there") + endif() diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch new file mode 100644 index 000000000..aa9f7ac1d --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch @@ -0,0 +1,175 @@ +diff --git a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake +index 00bb892be..af4677fdc 100644 +--- a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake ++++ b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake +@@ -355,9 +355,9 @@ function(add_compiler_rt_runtime name type) + DEPENDS ${sources_${libname}} + COMMENT "Building C object ${output_file_${libname}}") + add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}}) +- install(FILES ${output_dir_${libname}}/${output_file_${libname}} +- DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION}) ++ #install(FILES ${output_dir_${libname}}/${output_file_${libname}} ++ # DESTINATION ${install_dir_${libname}} ++ # ${COMPONENT_OPTION}) + else() + add_library(${libname} ${type} ${sources_${libname}}) + set_target_compile_flags(${libname} ${extra_cflags_${libname}}) +@@ -365,13 +365,13 @@ function(add_compiler_rt_runtime name type) + set_property(TARGET ${libname} APPEND PROPERTY + COMPILE_DEFINITIONS ${LIB_DEFS}) + set_target_output_directories(${libname} ${output_dir_${libname}}) +- install(TARGETS ${libname} +- ARCHIVE DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION} +- LIBRARY DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION} +- RUNTIME DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION}) ++ # install(TARGETS ${libname} ++ # ARCHIVE DESTINATION ${install_dir_${libname}} ++ # ${COMPONENT_OPTION} ++ # LIBRARY DESTINATION ${install_dir_${libname}} ++ # ${COMPONENT_OPTION} ++ # RUNTIME DESTINATION ${install_dir_${libname}} ++ # ${COMPONENT_OPTION}) + endif() + if(LIB_DEPS) + add_dependencies(${libname} ${LIB_DEPS}) +@@ -557,10 +557,10 @@ macro(add_compiler_rt_resource_file target_name file_name component) + COMMENT "Copying ${file_name}...") + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. +- install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR} +- COMPONENT ${component}) +- add_dependencies(${component} ${target_name}) ++ #install(FILES ${file_name} ++ # DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR} ++ # COMPONENT ${component}) ++ #add_dependencies(${component} ${target_name}) + + set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc") + endmacro() +diff --git a/llvm-project/libc/loader/linux/CMakeLists.txt b/llvm-project/libc/loader/linux/CMakeLists.txt +index 92ff8965b..e2aa73465 100644 +--- a/llvm-project/libc/loader/linux/CMakeLists.txt ++++ b/llvm-project/libc/loader/linux/CMakeLists.txt +@@ -90,7 +90,7 @@ foreach(target IN LISTS startup_components) + set(fq_target_name libc.loader.linux.${target}) + add_dependencies(libc-startup ${fq_target_name}) + get_target_property(loader_object ${fq_target_name} LOADER_OBJECT) +- install(FILES ${loader_object} +- DESTINATION ${CMAKE_INSTALL_LIBDIR} +- COMPONENT ${LIBC_COMPONENT}) ++ #install(FILES ${loader_object} ++ # DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ # COMPONENT ${LIBC_COMPONENT}) + endforeach() +diff --git a/llvm-project/libcxx/src/CMakeLists.txt b/llvm-project/libcxx/src/CMakeLists.txt +index 9abf548ab..2170d4391 100644 +--- a/llvm-project/libcxx/src/CMakeLists.txt ++++ b/llvm-project/libcxx/src/CMakeLists.txt +@@ -366,32 +366,32 @@ if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) + endif() + + if (LIBCXX_INSTALL_SHARED_LIBRARY) +- install(TARGETS cxx_shared +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) ++ #install(TARGETS cxx_shared ++ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) + endif() + + if (LIBCXX_INSTALL_STATIC_LIBRARY) +- install(TARGETS cxx_static +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) ++ # install(TARGETS cxx_static ++ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) + endif() + + if (LIBCXX_INSTALL_LIBRARY) +- install(TARGETS cxx_experimental +- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) ++ # install(TARGETS cxx_experimental ++ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) + endif() + + # NOTE: This install command must go after the cxx install command otherwise + # it will not be executed after the library symlinks are installed. + if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT) +- install(FILES "$<TARGET_LINKER_FILE:cxx_shared>" +- DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} +- COMPONENT libcxx) ++ # install(FILES "$<TARGET_LINKER_FILE:cxx_shared>" ++ # DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} ++ # COMPONENT libcxx) + endif() + + if (NOT CMAKE_CONFIGURATION_TYPES) +diff --git a/llvm-project/llvm/tools/lto/CMakeLists.txt b/llvm-project/llvm/tools/lto/CMakeLists.txt +index 67f6d3af4..51aa827a4 100644 +--- a/llvm-project/llvm/tools/lto/CMakeLists.txt ++++ b/llvm-project/llvm/tools/lto/CMakeLists.txt +@@ -32,9 +32,9 @@ endif() + add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN + ${SOURCES} DEPENDS intrinsics_gen) + +-install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c" +- COMPONENT LTO) ++#install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h ++# DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c" ++# COMPONENT LTO) + + if (APPLE) + set(LTO_VERSION ${LLVM_VERSION_MAJOR}) +diff --git a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt +index c0070f8cb..afe9756e0 100644 +--- a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt ++++ b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt +@@ -6,11 +6,11 @@ set (files + "optrecord.py" + "style.css") + +-foreach (file ${files}) +- install(PROGRAMS ${file} +- DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer" +- COMPONENT opt-viewer) +-endforeach (file) ++#foreach (file ${files}) ++ # install(PROGRAMS ${file} ++ # DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer" ++ # COMPONENT opt-viewer) ++ #endforeach (file) + + add_custom_target(opt-viewer DEPENDS ${files}) + if(NOT LLVM_ENABLE_IDE) +diff --git a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt +index f22cedd9e..13ec0103d 100644 +--- a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt ++++ b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt +@@ -18,9 +18,9 @@ if(LLVM_ENABLE_PIC) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -INCLUDE:malloc") + endif() + +- install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c" +- COMPONENT Remarks) ++ # install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c" ++ # COMPONENT Remarks) + + if (APPLE) + set(REMARKS_VERSION ${LLVM_VERSION_MAJOR}) diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch new file mode 100644 index 000000000..0bbd4d95e --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch @@ -0,0 +1,309 @@ +diff --git a/llvm-project/compiler-rt/include/CMakeLists.txt b/llvm-project/compiler-rt/include/CMakeLists.txt +index 5968cfd0e..b19de088b 100644 +--- a/llvm-project/compiler-rt/include/CMakeLists.txt ++++ b/llvm-project/compiler-rt/include/CMakeLists.txt +@@ -74,30 +74,30 @@ add_dependencies(compiler-rt compiler-rt-headers) + set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + + # Install sanitizer headers. +-install(FILES ${SANITIZER_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/sanitizer) ++#install(FILES ${SANITIZER_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/sanitizer) + # Install fuzzer headers. +-install(FILES ${FUZZER_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/fuzzer) ++#install(FILES ${FUZZER_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/fuzzer) + # Install xray headers. +-install(FILES ${XRAY_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/xray) ++#install(FILES ${XRAY_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/xray) + # Install ORC headers. +-install(FILES ${ORC_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/orc) ++#install(FILES ${ORC_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/orc) + # Install profile headers. +-install(FILES ${PROFILE_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/profile) ++#install(FILES ${PROFILE_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/profile) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/llvm-project/libclc/CMakeLists.txt b/llvm-project/libclc/CMakeLists.txt +index 96519e09e..4d971d617 100644 +--- a/llvm-project/libclc/CMakeLists.txt ++++ b/llvm-project/libclc/CMakeLists.txt +@@ -186,16 +186,16 @@ endif() + + # pkg-config file + configure_file( libclc.pc.in libclc.pc @ONLY ) +-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ) +-install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) ++#install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ) ++#install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) + + if( ENABLE_RUNTIME_SUBNORMAL ) + add_library( subnormal_use_default STATIC + generic/lib/subnormal_use_default.ll ) + add_library( subnormal_disable STATIC + generic/lib/subnormal_disable.ll ) +- install( TARGETS subnormal_use_default subnormal_disable ARCHIVE +- DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) ++ # install( TARGETS subnormal_use_default subnormal_disable ARCHIVE ++ # DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) + endif() + + find_package( Python3 REQUIRED COMPONENTS Interpreter ) +diff --git a/llvm-project/libcxxabi/include/CMakeLists.txt b/llvm-project/libcxxabi/include/CMakeLists.txt +index 5b1cc2545..587549494 100644 +--- a/llvm-project/libcxxabi/include/CMakeLists.txt ++++ b/llvm-project/libcxxabi/include/CMakeLists.txt +@@ -22,11 +22,11 @@ target_include_directories(cxxabi-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR} + if (LIBCXXABI_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) +- install(FILES ${file} +- DESTINATION ${LIBCXXABI_INSTALL_INCLUDE_DIR}/${dir} +- COMPONENT cxxabi-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- ) ++ # install(FILES ${file} ++ # DESTINATION ${LIBCXXABI_INSTALL_INCLUDE_DIR}/${dir} ++ # COMPONENT cxxabi-headers ++ # PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++ #) + endforeach() + + add_custom_target(install-cxxabi-headers +diff --git a/llvm-project/libunwind/include/CMakeLists.txt b/llvm-project/libunwind/include/CMakeLists.txt +index adf1766c4..5ca04b1f0 100644 +--- a/llvm-project/libunwind/include/CMakeLists.txt ++++ b/llvm-project/libunwind/include/CMakeLists.txt +@@ -13,11 +13,11 @@ target_include_directories(unwind-headers INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + if(LIBUNWIND_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) +- install(FILES ${file} +- DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" +- COMPONENT unwind-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- ) ++ #install(FILES ${file} ++ # DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" ++ # COMPONENT unwind-headers ++ # PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++ #) + endforeach() + + if(NOT CMAKE_CONFIGURATION_TYPES) +diff --git a/llvm-project/lld/cmake/modules/CMakeLists.txt b/llvm-project/lld/cmake/modules/CMakeLists.txt +index 61e7a1fe2..71395e8bb 100644 +--- a/llvm-project/lld/cmake/modules/CMakeLists.txt ++++ b/llvm-project/lld/cmake/modules/CMakeLists.txt +@@ -50,10 +50,10 @@ set(LLD_CONFIG_CMAKE_DIR) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install_distribution_exports(LLD) + +- install(FILES +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLDConfig.cmake +- DESTINATION ${LLD_INSTALL_PACKAGE_DIR} +- COMPONENT lld-cmake-exports) ++ #install(FILES ++ # ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLDConfig.cmake ++ # DESTINATION ${LLD_INSTALL_PACKAGE_DIR} ++ # COMPONENT lld-cmake-exports) + + if(NOT LLVM_ENABLE_IDE) + # Add a dummy target so this can be used with LLVM_DISTRIBUTION_COMPONENTS +diff --git a/llvm-project/llvm-libgcc/lib/CMakeLists.txt b/llvm-project/llvm-libgcc/lib/CMakeLists.txt +index d895a2155..fb1969249 100644 +--- a/llvm-project/llvm-libgcc/lib/CMakeLists.txt ++++ b/llvm-project/llvm-libgcc/lib/CMakeLists.txt +@@ -45,10 +45,10 @@ target_link_libraries(libgcc_s PRIVATE + extend_path(LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${CMAKE_INSTALL_PREFIX}" "${LIBUNWIND_INSTALL_LIBRARY_DIR}") + #string(REPLACE "${CMAKE_INSTALL_FULL_LIBDIR}/" "" LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}") + +-install(TARGETS libgcc_s +- LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind +- ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind) ++#install(TARGETS libgcc_s ++# LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind ++# ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind ++# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind) + + get_compiler_rt_install_dir(${LLVM_LIBGCC_TARGET_ARCH} install_dir_builtins) + string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}") +@@ -58,29 +58,29 @@ if(install_path_contains_triple EQUAL -1) + else() + string(PREPEND install_dir_builtins "../") + endif() +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a libgcc.a +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a libgcc.a ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) + +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink libunwind.a libgcc_eh.a +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink libunwind.so libgcc_s.so.1.0 +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink libgcc_s.so.1.0 libgcc_s.so.1 +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink libgcc_s.so.1 libgcc_s.so +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink libunwind.a libgcc_eh.a ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink libunwind.so libgcc_s.so.1.0 ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink libgcc_s.so.1.0 libgcc_s.so.1 ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink libgcc_s.so.1 libgcc_s.so ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) +diff --git a/llvm-project/llvm/CMakeLists.txt b/llvm-project/llvm/CMakeLists.txt +index c60e34efa..123704685 100644 +--- a/llvm-project/llvm/CMakeLists.txt ++++ b/llvm-project/llvm/CMakeLists.txt +@@ -999,8 +999,8 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") + include_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/tensorflow/include) + add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src + ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) +- install(TARGETS tf_xla_runtime EXPORT LLVMExports +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) ++ #install(TARGETS tf_xla_runtime EXPORT LLVMExports ++ # ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) + # Once we add more modules, we should handle this more automatically. + if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) +@@ -1247,44 +1247,44 @@ if (LLVM_INCLUDE_UTILS) + endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +- install(DIRECTORY include/llvm include/llvm-c +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- COMPONENT llvm-headers +- FILES_MATCHING +- PATTERN "*.def" +- PATTERN "*.h" +- PATTERN "*.td" +- PATTERN "*.inc" +- PATTERN "LICENSE.TXT" +- ) +- +- install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- COMPONENT llvm-headers +- FILES_MATCHING +- PATTERN "*.def" +- PATTERN "*.h" +- PATTERN "*.gen" +- PATTERN "*.inc" ++ #install(DIRECTORY include/llvm include/llvm-c ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ # COMPONENT llvm-headers ++ # FILES_MATCHING ++ # PATTERN "*.def" ++ # PATTERN "*.h" ++ # PATTERN "*.td" ++ # PATTERN "*.inc" ++ # PATTERN "LICENSE.TXT" ++ # ) ++ ++ # install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ # COMPONENT llvm-headers ++ # FILES_MATCHING ++ # PATTERN "*.def" ++ # PATTERN "*.h" ++ # PATTERN "*.gen" ++ # PATTERN "*.inc" + # Exclude include/llvm/CMakeFiles/intrinsics_gen.dir, matched by "*.def" +- PATTERN "CMakeFiles" EXCLUDE +- PATTERN "config.h" EXCLUDE +- ) ++ # PATTERN "CMakeFiles" EXCLUDE ++ # PATTERN "config.h" EXCLUDE ++ # ) + + if (LLVM_INSTALL_MODULEMAPS) +- install(DIRECTORY include/llvm include/llvm-c +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- COMPONENT llvm-headers +- FILES_MATCHING +- PATTERN "module.modulemap" +- ) +- install(FILES include/llvm/module.install.modulemap +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm" +- COMPONENT llvm-headers +- RENAME "module.extern.modulemap" +- ) ++ # install(DIRECTORY include/llvm include/llvm-c ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ # COMPONENT llvm-headers ++ # FILES_MATCHING ++ # PATTERN "module.modulemap" ++ # ) ++ # install(FILES include/llvm/module.install.modulemap ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm" ++ # COMPONENT llvm-headers ++ # RENAME "module.extern.modulemap" ++ # + endif(LLVM_INSTALL_MODULEMAPS) +- ++ # + # Installing the headers needs to depend on generating any public + # tablegen'd headers. + add_custom_target(llvm-headers DEPENDS intrinsics_gen omp_gen)
