diff options
Diffstat (limited to 'dev-util')
20 files changed, 656 insertions, 6 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex e706f8f6da5f..bc95852cb3a3 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest index 848701d5f284..59d15ad5b092 100644 --- a/dev-util/cbindgen/Manifest +++ b/dev-util/cbindgen/Manifest @@ -109,5 +109,5 @@ DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cac DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2 EBUILD cbindgen-0.26.0.ebuild 1400 BLAKE2B ed8b1d14ecf92e601a7166e6254b8ac12b78af4583fc5fe7cfcdad7231798a04ce0b3914ab6f0d4784eff20faac10117afc86213eaf23724a89a181884b88792 SHA512 785802fce4b3831b10d0b2e2a8a9da68aaefa84e0ec5f3f7274c175bebec216b908b8c16b222b0cdaa1a56f1c122ca16c09eb18a3c03afd3bda7b72619090f59 -EBUILD cbindgen-0.27.0.ebuild 2059 BLAKE2B e7478b5aa25478044771797f7bb94f44e16ae486dceea9bfea1dd0469c57e3697e3abad6db5cfdf8bda7b589e56e71b94d4d31ab0e8f3b6d04af823ac6484760 SHA512 1afe6ba0c256862f22d8bcdf5e43d632d7bbf4de5de295a734c3314c0abd7e7723e5c5956689995338715dc5891e656289a04f602737b9802ce7342e4a5644a5 +EBUILD cbindgen-0.27.0.ebuild 2058 BLAKE2B 61abf62f05f99c7cc47926750ee63d59c04e5f5d53e4c5ae83e96d9aba0fb20f364d12d8cd0658dbc416ac2e76639c1fcacfcc44a754cf7272a4b86380e6f1ab SHA512 3bb40d838c7ddbd68b9c3ddc15693b91ea98f7cc51bb2ef1d15f2576f0df5f7e6fbdb16a499389346ce9ce16c565063e91f7892e4bed32a0f2d233867eda8516 MISC metadata.xml 336 BLAKE2B e2c5a91f198a9d49aabefa764c9a15e132c94819daf2d6282bfa883b00bc2ff69b6a475ac7739f3546afeb169d69fadbaff28803d9969f9b74fe8fead3d1e4d0 SHA512 92bd73dc605d28ff19c4b74ba3c499054d75a11dfdc3a25d4de6fd016e4d6683659eaf0459a1ed5227af2d919b876508c6da32635776a0be1b4cdefbc7f8bd27 diff --git a/dev-util/cbindgen/cbindgen-0.27.0.ebuild b/dev-util/cbindgen/cbindgen-0.27.0.ebuild index d3c46b3e910c..8c5bac853d65 100644 --- a/dev-util/cbindgen/cbindgen-0.27.0.ebuild +++ b/dev-util/cbindgen/cbindgen-0.27.0.ebuild @@ -88,7 +88,7 @@ LICENSE+=" || ( Apache-2.0 Boost-1.0 ) " SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86" IUSE="test" # Needs debugging enabled and lots of other problems. diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest index 868b3ad68670..2cf6afaa8f8e 100644 --- a/dev-util/clazy/Manifest +++ b/dev-util/clazy/Manifest @@ -3,6 +3,12 @@ AUX clazy-1.11-fix-llvm-16.patch 3418 BLAKE2B bee024e761008e6d1bf14f4ac285fecab7 AUX clazy-1.11-fix-llvm-17.patch 1546 BLAKE2B fdc8a1387c6db82c993ec935bcbbe1e58f6e754f90efb65f9f8da2ab00e2240a9a7dcc287f3055a3a86e91f7dd8b6ddb8c1df9e7c4bfc9831f401fea14055c4f SHA512 90c60cc4d6b589ddba1a5b6b9bc077dd79a48894bcdce0cb99d51e768ee325b21cc83e56e57f1cfd1d4bb2c7e443d663c2dec55aca5e07df8db0ce19f0fa99c8 AUX clazy-1.11-fix-regex-detect.patch 859 BLAKE2B 6a953c3927dcc1a3aac5aab55c01eb1eaf977f40c96c26f57032608de8e0d709ae6bf67f5d04f991ee14ded80023a8faf19b9ea18f9a2e2dd9dc19b2831ff58c SHA512 8bd1ab72bf36620250a228f9cb45fe403853d16c5eec8704c6980405ffca71cfcea82f9587b3b3f748ab623ecee757cb8adc54c7a137c5070eb04e26d06fab36 AUX clazy-1.11-jobs-for-tests.patch 1626 BLAKE2B 58d8c059fa631c2c534e6ec2c33268af88ef95e5ed7b1b3bb37d189d61bd998143a7fa5d38d40a925c6dd59592e0df30c22d42c04cb3f1bb5d915afad2b879e9 SHA512 1fd25f986d8ecf092fe3dcf73a61609f183e1d90d4926676cd8c4de34326a8ed7610a05dee5eafe91d4a5b830f4423c5b66be3f049a26b632e1e094f3f2ac446 +AUX clazy-1.12-clang-16-no-src-root.patch 2167 BLAKE2B 84f2cd26abea61998f4e78cb325126bd61b539924bbb1140793b888db8c80b891afb21700472a8d44d0c37e6da613350be570802ceffcd342463854bcd45af6f SHA512 da93e8320184f832c20f390d9b77a9829972cb9d95ca801d072efc41fc88fd584fc423a000c40621f86040fe5a9d3468382f390a7b525b4677a1e7163004d466 +AUX clazy-1.12-fix-tests-Qt-detect-1.patch 3388 BLAKE2B 4aace0f453e84a3e00651eda4a30dc1b84032789d22a7cedd1eee7338d5f52f49f03e0e92a1220de187ad90e9a3cf9ab14c8f5e1f57559d8a385f3bd705a771b SHA512 926a8fbfd7134b9e1b553273e39817cb35d5e6b5d29ed43b77b5eedef9faa6d9cde7441923d5bf6eaf2b19b2d7c7a97b23ae866ff1b8b5e3a02754a2234183f6 +AUX clazy-1.12-fix-tests-Qt-detect-2.patch 5164 BLAKE2B 7ce4d58f5ca52df4ce229c7892cec13754e557000e755f7f3954b7810aacad3e5d001e0ea90422191c5869b954387cb22baff2e485666e9f0ef2803819587a4c SHA512 3b84aa5f407402a4abef33090f2efc60cc8dca47f0f2324c61f825b674023080ec9c4d693aed451642c80dd38759ef8bca942faff6dad7d6bc79aa1be4515a14 +AUX clazy-1.12-llvm-18.patch 1532 BLAKE2B 6527759799a8e99db6c996177f2f4ed9b1fd5f2327b2a950db6138c2bc4dd6c0b8f2d06bc45668836b8a6fc406df0973f9b3f5218361f2d401b7180cb824e308 SHA512 b0666907bb4d023e605b2b8ce4fd9addaa477e87a811d38bdb68c03bdf4a45d52fabb191e300cf3f877eb32189e23b23046c702c11e50527b474d79e4695c2de DIST clazy-1.11.tar.xz 404088 BLAKE2B 1a69fe07ef81a0efe3c9db9129083247d60943592967f705d62d3859039cec250673eecc06184f70d134cbab85708d957b0a085beff8b3e46325a69547e005b7 SHA512 6a7c162392dd30aea29669275cea814d6daccf7931b8cdb20997f9bbff5619832d5461a6d0f854ecbc4726e52b6937c4f9cb8651087ffe73676c04239a38ca2b +DIST clazy-1.12.tar.xz 427740 BLAKE2B ad2c78a506132b5fd6b3c22a7e9794c38ddd71242cde6f760e48d0250f6215629007d45303f4b35fdc7717865b8221ab1c2f3c6889a44ea1809e112845f16463 SHA512 7a2b4a753098f15936a4731c82c660c1cd4d81949279435e87f00f7f72bef3e32cb574c8991c0707798581278e9fbcae34d354c1e6b77a15a5e26166d658fa9e EBUILD clazy-1.11-r4.ebuild 1312 BLAKE2B 5ff282ba38629cdd15ea65c1837d798563ac6ef396f771c6d91058c3e0f82ffab4e69b2ca7842afc96514b89b49c23f4aac291d6c186bdc285510500e87e063f SHA512 7c6e9aee3960b00e778455fd9832b41d845beaff25e1fb9c0959168598c3162a93c3592164533ea9183d782b5ebcfa54a4ffbab28544e69318628d0e62cd460f +EBUILD clazy-1.12.ebuild 1339 BLAKE2B 5722f7d78da41318a8623c6a8252718ed8d9419e254a28e6ee1bb5ce0a5c8e2ffbf5ce20446be29a85f0f4b6ba03ba80c3536a7e28e2a43ab1bc7fb9806a3821 SHA512 726222bfc835c0ada17db5f8f7a1df0aeb59bf4b3f3a6c009e14f62e0ddb50ba02fc2b0782baabf332fd43d7c01c4c73e9c9758b3287abc1f329f3e11ad00973 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/dev-util/clazy/clazy-1.12.ebuild b/dev-util/clazy/clazy-1.12.ebuild new file mode 100644 index 000000000000..b5e819706f76 --- /dev/null +++ b/dev-util/clazy/clazy-1.12.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( 15 16 17 18 ) +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake llvm-r1 python-any-r1 + +DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics" +HOMEPAGE="https://apps.kde.org/clazy" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="0" +# KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') + $(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}') +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( ${PYTHON_DEPS} )" + +PATCHES=( + # git master + "${FILESDIR}"/${P}-fix-tests-Qt-detect-{1,2}.patch + "${FILESDIR}"/${P}-llvm-18.patch + # Pending: https://invent.kde.org/sdk/clazy/-/merge_requests/131 + "${FILESDIR}"/${P}-clang-16-no-src-root.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup + llvm-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \ + -i CMakeLists.txt || die +} + +src_configure() { + export LLVM_ROOT="$(get_llvm_prefix -d)" + + cmake_src_configure +} + +src_test() { + # Run tests against built copy, not installed + # bug #811723 + PATH="${BUILD_DIR}/bin:${PATH}" LD_LIBRARY_PATH="${BUILD_DIR}/lib" cmake_src_test +} diff --git a/dev-util/clazy/files/clazy-1.12-clang-16-no-src-root.patch b/dev-util/clazy/files/clazy-1.12-clang-16-no-src-root.patch new file mode 100644 index 000000000000..ca88efeaf6cd --- /dev/null +++ b/dev-util/clazy/files/clazy-1.12-clang-16-no-src-root.patch @@ -0,0 +1,60 @@ +From 4fa1ded456626f9c13f1f77212754d6349d12a8a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de> +Date: Tue, 27 Feb 2024 21:14:19 +0100 +Subject: [PATCH] [cmake] Adjust for non-installed LLVM + +In LLVM 16 llvm-config got --src-root removed. +Adjust include path for Clang include +--- + cmake/FindClang.cmake | 8 ++++++-- + cmake/FindLLVM.cmake | 6 +++++- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake +index e438ea5c..b4f0b0a1 100644 +--- a/cmake/FindClang.cmake ++++ b/cmake/FindClang.cmake +@@ -86,8 +86,12 @@ if(CLANG_FOUND) + set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) + + # check whether llvm-config comes from an install prefix ++ set(LLVM_CONFIG_INCLUDE_FLAG "--src-root") ++ if (${LLVM_VERSION} VERSION_GREATER_EQUAL 16) ++ set(LLVM_CONFIG_INCLUDE_FLAG "--includedir") ++ endif() + execute_process( +- COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root ++ COMMAND ${LLVM_CONFIG_EXECUTABLE} ${LLVM_CONFIG_INCLUDE_FLAG} + OUTPUT_VARIABLE _llvmSourceRoot + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +@@ -96,7 +100,7 @@ if(CLANG_FOUND) + message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang") + list(APPEND CLANG_INCLUDE_DIRS + "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir +- "${_llvmSourceRoot}/tools/clang/include" # source dir ++ "${_llvmSourceRoot}/../../clang/include" # source dir + ) + endif() + +diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake +index da02e006..c625eeb5 100644 +--- a/cmake/FindLLVM.cmake ++++ b/cmake/FindLLVM.cmake +@@ -131,8 +131,12 @@ if (LLVM_FOUND) + endif() + + # potentially add include dir from binary dir for non-installed LLVM ++ set(LLVM_CONFIG_INCLUDE_FLAG "--src-root") ++ if (${LLVM_VERSION} VERSION_GREATER_EQUAL 16) ++ set(LLVM_CONFIG_INCLUDE_FLAG "--includedir") ++ endif() + execute_process( +- COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root ++ COMMAND ${LLVM_CONFIG_EXECUTABLE} ${LLVM_CONFIG_INCLUDE_FLAG} + OUTPUT_VARIABLE _llvmSourceRoot + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +-- +GitLab + diff --git a/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-1.patch b/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-1.patch new file mode 100644 index 000000000000..bca03b24dff4 --- /dev/null +++ b/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-1.patch @@ -0,0 +1,78 @@ +From 61b03a0d9cb319173766383216deee74fd6d800e Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau <alexander.lohnau@gmx.de> +Date: Sat, 7 Sep 2024 11:31:22 +0200 +Subject: [PATCH] Make tests work when clang library is different from system + default + +If we have found the clang folder, we can resolve the executable from there. +In my case, I was compiling against clang16, but my system default was clang 14. +The stacktrace is really confusing and hard to understand. Using the +absolute path makes the log also better to understand and to reproduce +the test results. +--- + ClazyTests.generated.cmake | 5 ++++- + cmake/FindLLVM.cmake | 13 +++++++++++++ + dev-scripts/generate.py | 5 ++++- + 3 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/ClazyTests.generated.cmake b/ClazyTests.generated.cmake +index 204f0e5b..49b0f69e 100644 +--- a/ClazyTests.generated.cmake ++++ b/ClazyTests.generated.cmake +@@ -2,8 +2,11 @@ + + macro(add_clazy_test name) + add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/) ++ if (CLANG_EXECUTABLE_PATH) ++ set(CLANG_CXX_TEST "CLANGXX=${CLANG_EXECUTABLE_PATH};") ++ endif() + set_property(TEST ${name} PROPERTY +- ENVIRONMENT "CLAZYPLUGIN_CXX=$<TARGET_FILE:ClazyPlugin>;CLAZYSTANDALONE_CXX=$<TARGET_FILE:clazy-standalone>;$<$<BOOL:${HAS_STD_FILESYSTEM}>:CLAZY_HAS_FILESYSTEM=>" ++ ENVIRONMENT "${CLANG_CXX_TEST}CLAZYPLUGIN_CXX=$<TARGET_FILE:ClazyPlugin>;CLAZYSTANDALONE_CXX=$<TARGET_FILE:clazy-standalone>;$<$<BOOL:${HAS_STD_FILESYSTEM}>:CLAZY_HAS_FILESYSTEM=>" + ) + endmacro() + +diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake +index a1fd9e3f..da02e006 100644 +--- a/cmake/FindLLVM.cmake ++++ b/cmake/FindLLVM.cmake +@@ -117,6 +117,19 @@ if (LLVM_FOUND) + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + ++ execute_process( ++ COMMAND ${LLVM_CONFIG_EXECUTABLE} --bindir ++ OUTPUT_VARIABLE LLVM_BIN_DIR ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ) ++ set(CLANG_EXECUTABLE_PATH "${LLVM_BIN_DIR}/clang") ++ if(EXISTS ${CLANG_EXECUTABLE_PATH}) ++ message(STATUS "Clang found: ${CLANG_EXECUTABLE_PATH}") ++ set(CLANG_EXECUTABLE ${CLANG_EXECUTABLE_PATH}) ++ else() ++ message(WARNING "Clang not found in LLVM bin directory: ${LLVM_BIN_DIR}") ++ endif() ++ + # potentially add include dir from binary dir for non-installed LLVM + execute_process( + COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root +diff --git a/dev-scripts/generate.py b/dev-scripts/generate.py +index 2678aaba..11fc5bfc 100755 +--- a/dev-scripts/generate.py ++++ b/dev-scripts/generate.py +@@ -468,8 +468,11 @@ def generate_ctest(checks): + contents = """# This file was autogenerated by running: ./dev-scripts/generate.py --generate\n + macro(add_clazy_test name) + add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/) ++ if (CLANG_EXECUTABLE_PATH) ++ set(CLANG_CXX_TEST "CLANGXX=${CLANG_EXECUTABLE_PATH};") ++ endif() + set_property(TEST ${name} PROPERTY +- ENVIRONMENT "CLAZYPLUGIN_CXX=$<TARGET_FILE:ClazyPlugin>;CLAZYSTANDALONE_CXX=$<TARGET_FILE:clazy-standalone>;$<$<BOOL:${HAS_STD_FILESYSTEM}>:CLAZY_HAS_FILESYSTEM=>" ++ ENVIRONMENT "${CLANG_CXX_TEST}CLAZYPLUGIN_CXX=$<TARGET_FILE:ClazyPlugin>;CLAZYSTANDALONE_CXX=$<TARGET_FILE:clazy-standalone>;$<$<BOOL:${HAS_STD_FILESYSTEM}>:CLAZY_HAS_FILESYSTEM=>" + ) + endmacro()\n + """ +-- +GitLab + diff --git a/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-2.patch b/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-2.patch new file mode 100644 index 000000000000..9e5276644ad7 --- /dev/null +++ b/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-2.patch @@ -0,0 +1,115 @@ +From fc058479b1d0ab8498b23a68dcbb56be1b38c793 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau <alexander.lohnau@gmx.de> +Date: Sat, 7 Sep 2024 14:25:45 +0200 +Subject: [PATCH] Only look for Qt5/Qt6 installs if respective CI job is + running + +We may have a qt6 installation even on a Qt5 image + +But in any case, we should only run them on the dedicated im age and not waste CI time otherwise +--- + ClazyTests.generated.cmake | 8 +++++++- + dev-scripts/generate.py | 8 +++++++- + tests/run_tests.py | 22 ++++++++++++++-------- + 3 files changed, 28 insertions(+), 10 deletions(-) + +diff --git a/ClazyTests.generated.cmake b/ClazyTests.generated.cmake +index 49b0f69e..9babc7c5 100644 +--- a/ClazyTests.generated.cmake ++++ b/ClazyTests.generated.cmake +@@ -1,7 +1,13 @@ + # This file was autogenerated by running: ./dev-scripts/generate.py --generate + ++if ($ENV{CI_JOB_NAME_SLUG} MATCHES "qt5") ++ set(TEST_VERSION_OPTION "--qt-versions=5") ++elseif($ENV{CI_JOB_NAME_SLUG} MATCHES "qt6") ++ set(TEST_VERSION_OPTION "--qt-versions=6") ++endif() ++ + macro(add_clazy_test name) +- add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/) ++ add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose ${TEST_VERSION_OPTION} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/) + if (CLANG_EXECUTABLE_PATH) + set(CLANG_CXX_TEST "CLANGXX=${CLANG_EXECUTABLE_PATH};") + endif() +diff --git a/dev-scripts/generate.py b/dev-scripts/generate.py +index 11fc5bfc..a1233698 100755 +--- a/dev-scripts/generate.py ++++ b/dev-scripts/generate.py +@@ -466,8 +466,14 @@ def generate_ctest(checks): + filename = clazy_source_path() + 'ClazyTests.generated.cmake' + + contents = """# This file was autogenerated by running: ./dev-scripts/generate.py --generate\n ++if ($ENV{CI_JOB_NAME_SLUG} MATCHES "qt5") ++ set(TEST_VERSION_OPTION "--qt-versions=5") ++elseif($ENV{CI_JOB_NAME_SLUG} MATCHES "qt6") ++ set(TEST_VERSION_OPTION "--qt-versions=6") ++endif() ++ + macro(add_clazy_test name) +- add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/) ++ add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose ${TEST_VERSION_OPTION} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/) + if (CLANG_EXECUTABLE_PATH) + set(CLANG_CXX_TEST "CLANGXX=${CLANG_EXECUTABLE_PATH};") + endif() +diff --git a/tests/run_tests.py b/tests/run_tests.py +index 9fb9d5dc..da54e45a 100755 +--- a/tests/run_tests.py ++++ b/tests/run_tests.py +@@ -457,6 +457,8 @@ parser.add_argument("--only-standalone", action='store_true', + help='Only run clazy-standalone') + parser.add_argument("--dump-ast", action='store_true', + help='Dump a unit-test AST to file') ++parser.add_argument("--qt-versions", type=int, choices=[5, 6], nargs='+', default=[5, 6], ++ help='Specify one or more Qt versions to use (default: 5 and 6)') + parser.add_argument( + "--exclude", help='Comma separated list of checks to ignore') + parser.add_argument("-j", "--jobs", type=int, default=multiprocessing.cpu_count(), +@@ -481,10 +483,14 @@ _only_standalone = args.only_standalone + _num_threads = args.jobs + _lock = threading.Lock() + _was_successful = True +-_qt6_installation = find_qt_installation( +- 6, ["QT_SELECT=6 qmake", "qmake-qt6", "qmake", "qmake6"]) +-_qt5_installation = find_qt_installation( +- 5, ["QT_SELECT=5 qmake", "qmake-qt5", "qmake", "qmake5"]) ++if 6 in args.qt_versions: ++ _qt6_installation = find_qt_installation(6, ["QT_SELECT=6 qmake", "qmake-qt6", "qmake", "qmake6"]) ++else: ++ _qt6_installation = None ++if 5 in args.qt_versions: ++ _qt5_installation = find_qt_installation(5, ["QT_SELECT=5 qmake", "qmake-qt5", "qmake", "qmake5"]) ++else: ++ _qt5_installation = None + _excluded_checks = args.exclude.split(',') if args.exclude is not None else [] + + # ------------------------------------------------------------------------------- +@@ -697,6 +703,8 @@ def run_unit_test(test, is_standalone, cppStandard, qt_major_version): + return True + + qt = qt_installation(qt_major_version) ++ if qt == None: ++ return True # silently skip + + if _verbose: + print("Qt major versions required by the test: " + str(test.qt_major_versions)) +@@ -709,14 +717,12 @@ def run_unit_test(test, is_standalone, cppStandard, qt_major_version): + + if qt.int_version < test.minimum_qt_version or qt.int_version > test.maximum_qt_version or CLANG_VERSION < test.minimum_clang_version: + if (_verbose): +- print("Skipping " + printableName + +- " because required version is not available") ++ print("Skipping " + printableName + " because required version is not available") + return True + + if test.requires_std_filesystem and not _hasStdFileSystem: + if (_verbose): +- print("Skipping " + printableName + +- " because it requires std::filesystem") ++ print("Skipping " + printableName + " because it requires std::filesystem") + return True + + if _platform in test.blacklist_platforms: +-- +GitLab + diff --git a/dev-util/clazy/files/clazy-1.12-llvm-18.patch b/dev-util/clazy/files/clazy-1.12-llvm-18.patch new file mode 100644 index 000000000000..d1f2bea9ffbf --- /dev/null +++ b/dev-util/clazy/files/clazy-1.12-llvm-18.patch @@ -0,0 +1,36 @@ +From 0d87de91457c3bf2338b997555694953d45e17a4 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau <alexander.lohnau@gmx.de> +Date: Tue, 10 Sep 2024 13:50:56 +0200 +Subject: [PATCH] rule-of-three: Fix destructor not being found and thus + causing false positive + +This works fine in clang 14, but apparently not in later versions + +The false positive caused a CI failure in https://invent.kde.org/libraries/qca/-/merge_requests/116 +--- + src/checks/level2/rule-of-three.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/checks/level2/rule-of-three.cpp b/src/checks/level2/rule-of-three.cpp +index 6996ee1e..f18ff999 100644 +--- a/src/checks/level2/rule-of-three.cpp ++++ b/src/checks/level2/rule-of-three.cpp +@@ -56,7 +56,14 @@ void RuleOfThree::VisitDecl(clang::Decl *decl) + + CXXConstructorDecl *copyCtor = Utils::copyCtor(record); + CXXMethodDecl *copyAssign = Utils::copyAssign(record); +- CXXDestructorDecl *destructor = record->getDestructor(); ++ CXXDestructorDecl *destructor = nullptr; ++ // Getting the destructor using record->getDestructor() does not work for later clang versions, e.g. clang 16 ++ for (auto *decl : record->decls()) { ++ if (auto *destructorDecl = dyn_cast<CXXDestructorDecl>(decl)) { ++ destructor = destructorDecl; ++ break; ++ } ++ } + const bool dtorDefaultedByUser = destructor && destructor->isDefaulted() && !destructor->isImplicit(); + + const bool hasUserCopyCtor = copyCtor && copyCtor->isUserProvided(); +-- +GitLab + diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest index 169edd8f8d16..a0c654d00966 100644 --- a/dev-util/desktop-file-utils/Manifest +++ b/dev-util/desktop-file-utils/Manifest @@ -1,5 +1,5 @@ AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3 DIST desktop-file-utils-0.27.tar.xz 80808 BLAKE2B 66708cd11d5f81824cad814846cdeac6c339e8e93a7f1dceaeed545d9dc1940523fd64ae890e54632b3d32cc91b258aabd41d6d467081539f978ae2993fdfb22 SHA512 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8 -EBUILD desktop-file-utils-0.27-r1.ebuild 674 BLAKE2B 875ef936648df04c12ed79e151010acf64ffb8ab5d085e3fd97d30b5ce021ff71d583fd15d86180d289268c436b4b32f16a25b1b9d5e85bdd22e38dd278bff17 SHA512 9ff2fdf2c209267e02377f057f1b80a093f1c19f8494588d72d9902f95cd498009a5edb51d71f83e141e2e7bd41c2cc086fccbc58450612cedf6eab19006ddd6 +EBUILD desktop-file-utils-0.27-r1.ebuild 673 BLAKE2B 367514327bf5b6ad94845353b6c2cb347861cdb4a6c90dca5572d1c26b75f10c3bc84139f61a83228e770085b60fd12ebc5b68675ba21ad2f7a48b60b7aefd1b SHA512 e0adf8b9d14cd208bb0450154fbbdaae81d11683ba09205490575347bb590c5c9c28156c86c01ea5cdb8e0d5e6544a17638b75efc16356fd3f4907a515718143 EBUILD desktop-file-utils-0.27.ebuild 1132 BLAKE2B 03c571e7098c6039fc879a22a2d538c348599ae17991bbd9a560710b24c0a9e6c67e24eb9fa0d5ee83d4fa6176cec03dd9d594a656ebc6f5f4dc93c9e379a749 SHA512 212cd916da3982fb3203c428fe2db2b55025efc9aea1b80a6ca07cd6b98473ffcb34f7ac32f595087ffb0b7b41f5a848b9762436aa83f2c6cc8cdb5c68ab9b13 MISC metadata.xml 225 BLAKE2B 293ebc97ac40be7df2825c558f7def8026a2c8b49af06c8a5fc0dfb58657ee3093306f2a6b90bce5f7fc10f9c3165eee3cd77b58fcea8d293dacff5ba2f04657 SHA512 6f3645f7fe9f5362268973d150b122dcaef666c61e30ddc96917485c617568105aadf7b8d78bf06e402f8592c90369fdc7d949832b9fda13258b4693f1c4c6f3 diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild index 8ec2df453d67..7afca699af8c 100644 --- a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild +++ b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" RDEPEND=">=dev-libs/glib-2.12:2" DEPEND="${RDEPEND}" diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest index bdc3600e136a..c69a3464ecf2 100644 --- a/dev-util/fq/Manifest +++ b/dev-util/fq/Manifest @@ -4,10 +4,13 @@ DIST fq-0.11.0-deps.tar.xz 12384484 BLAKE2B 5b60f1f5d0189ab9d734f24a119a67529fff DIST fq-0.11.0.tar.gz 17696740 BLAKE2B 6f1bd80bdc13a3c271311440869905dbadee229af6243e6121216604e55216deba7fa02838cf7f0bdef9cfc3202ae3132eb60ad90b6b75f3e5731fd2ce076f9c SHA512 a953046f1d12e6bd519d8f54521e3d48a727b8acfb0f3ff63cee139f97b35e54399e16158a1dda719f2068322fe377eff11200870e4db28992176598ee2b4efe DIST fq-0.12.0-deps.tar.xz 12362664 BLAKE2B c1453465b4ffee0103ce075c3df0157912b09b6614b68f8c7b219767579c815a297df75fd8a230f455f9235e6f9cce5df50e564b4d09303dd846549fd4b504cd SHA512 f94054a5ce888bffb757c36d8208ab3eae8f3793195d9cb5c199caf5c89eebb1a8827a19f9d60f341d29b65496ebbb1795946e63211f995a98bef605d8aef4bd DIST fq-0.12.0.tar.gz 17697247 BLAKE2B 90399317b2ede730379a2931eb8096fa276ef16ad7ffcc625fa839168dbc66638c1bc7d3fe3e57b70ada70db83bc634c8dedd5e008a49f05553eea6083bcb084 SHA512 d280865b300106784e91f66b44b21d82cf177cc8e5d91b9891202f41ca1399a64f0be572821c51141a6fd2a14267fe4dab03bbdd5c6fd2263e15bae934652264 +DIST fq-0.13.0-deps.tar.xz 12352972 BLAKE2B a30032d77aa03a901a2c936ab7652f6c65b5c9557c2e11a7e1910ebc230074d44d95e8a3cece35d867cbc552b0e68cc71d369f1939fcbfb9d52a1f87d03951b1 SHA512 4281b5961d57999842359ef0557000265609f6eb0a24341ad2e2862e0dd8d5c55206c876e4f6e306faf1ec2e6fcc2d5259c8d96049acfc98e0db36da48dbd2e3 +DIST fq-0.13.0.tar.gz 17869543 BLAKE2B 8d442d740a77653867e734a4bfec0ad837a449d060e8a9d061c4dbd84f1ce1ea48fcd8d17e84a878713feff8c0d9f6e8f93b1e14d7dcef8016ede74056788061 SHA512 c510e7c72e08c1267eb17060cd1969af4885e6d861d57951671118d79879f18173fae88384687f23797158433b567969c2ad0e5b5b3f97658d6fa1b7b1c7f7f1 DIST fq-0.9.0-deps.tar.xz 12255984 BLAKE2B b14169dd1f6889ee7c8460d11e5e8306ff96b85c68865d4335bb2cb42df85eb3f30423e55647ba3e4568115f6d68fab576a369a3662614d51c17355ca927f52b SHA512 ffed1929c17c6397df2a4845034014a8d33400caa6579e79e637818a03340be47c449ec258174dc980cbbc3abab3d691449430b23da790ff860999122412b461 DIST fq-0.9.0.tar.gz 15107174 BLAKE2B 4ab47ff8e726d1af9785cf9d83e628235cd43ef659c93a5a15759f7844f5c323e0e4ae82dea45b7b9c756f9cb264c0f7164a9fbe6fecdde1478f94c6a3301784 SHA512 4b8fdf25cd4aa255d4f689d612c1f43997e277fa4b4f522a0b346ec55ebdbeef93a20fdfb78a2c23df16a475c70abebec507145f0fb8d2ca1d3f564076b2ddad EBUILD fq-0.10.0.ebuild 859 BLAKE2B 3fa0bbb43631ca808c7817c2dda53c836adc925048a15512f186a260e2dc406459867208382f6af135b9ce6004edb9bc6b1dd4710169d2b6f304d7e84f0a419c SHA512 1be83a100054634ab68b41d527e16804e0165ca9fac145c67703459f04e8d586870b3b73211bef7ec9a90ad0ef50c1646dc8cb0c823085d6b5ce1b9d8c3563ab EBUILD fq-0.11.0.ebuild 859 BLAKE2B 3fa0bbb43631ca808c7817c2dda53c836adc925048a15512f186a260e2dc406459867208382f6af135b9ce6004edb9bc6b1dd4710169d2b6f304d7e84f0a419c SHA512 1be83a100054634ab68b41d527e16804e0165ca9fac145c67703459f04e8d586870b3b73211bef7ec9a90ad0ef50c1646dc8cb0c823085d6b5ce1b9d8c3563ab EBUILD fq-0.12.0.ebuild 860 BLAKE2B e8f33b4a1409f813422eae843c51776884b55150465abbb339f96b1c47d50ab6ed258afef64953e68dadcb96a0f62e3bb8fb179aed0bf0c04bb5ee9db003294e SHA512 40aa0b30d7b87545b2b7834cb69790763a7565cba2dade3e33236cba0bd49e987bf2e67302e0dc5fc04122308d599b7c4490598a1aeb4ed88e9efedf1eb4c6f6 +EBUILD fq-0.13.0.ebuild 860 BLAKE2B e8f33b4a1409f813422eae843c51776884b55150465abbb339f96b1c47d50ab6ed258afef64953e68dadcb96a0f62e3bb8fb179aed0bf0c04bb5ee9db003294e SHA512 40aa0b30d7b87545b2b7834cb69790763a7565cba2dade3e33236cba0bd49e987bf2e67302e0dc5fc04122308d599b7c4490598a1aeb4ed88e9efedf1eb4c6f6 EBUILD fq-0.9.0.ebuild 859 BLAKE2B 3fa0bbb43631ca808c7817c2dda53c836adc925048a15512f186a260e2dc406459867208382f6af135b9ce6004edb9bc6b1dd4710169d2b6f304d7e84f0a419c SHA512 1be83a100054634ab68b41d527e16804e0165ca9fac145c67703459f04e8d586870b3b73211bef7ec9a90ad0ef50c1646dc8cb0c823085d6b5ce1b9d8c3563ab MISC metadata.xml 313 BLAKE2B 49888cd21e49fca7d7913fbd265cbffd73dcfaa5080e09ccd1f5b9c62804e5b9fb1de1e21df96609079c18c481b2847897b4fe1a9fc499d0e6dc2559e677a27f SHA512 1d125e77b24aeffe27b0d54b8b9f247e1e2b62037bdb127f232d3089d63e1b92c2062e37446067850defc382d7e49785152e9af86cd46f44827e2e037dd291a7 diff --git a/dev-util/fq/fq-0.13.0.ebuild b/dev-util/fq/fq-0.13.0.ebuild new file mode 100644 index 000000000000..e41588bcdc59 --- /dev/null +++ b/dev-util/fq/fq-0.13.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)" +HOMEPAGE="https://github.com/wader/fq" +SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="MIT BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-tcltk/expect )" + +src_prepare() { + default + + # Don't unconditionally (and therefore twice) build tests + # TODO: upstream + sed -i -e 's/all: test fq/all: fq/' Makefile || die +} + +src_compile() { + # Avoid -s being set in Makefile (stripping) + export GO_BUILD_LDFLAGS="-w" + + default +} + +src_install() { + einstalldocs + + dobin fq +} diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest index bf5df82febbf..b9a880f218d4 100644 --- a/dev-util/pkgcheck/Manifest +++ b/dev-util/pkgcheck/Manifest @@ -3,7 +3,7 @@ DIST pkgcheck-0.10.29.tar.gz 377521 BLAKE2B 91a1a25e6ef173582fc9082b92baa66489fd DIST pkgcheck-0.10.30.tar.gz 378098 BLAKE2B f80224d707f7656ca45f58932936e1ce780d670be596312532b88940fbe1cfb1c7e14a877a955fc4f21fb003a2ee5c6095c2c6919475cdc95db9be0736050b50 SHA512 078ba2275e39e645eca22a265c9f06c6dd7d1cb310979ab5e48bb86a374b42edc50c0ca8d0bd671a3b51341b7fae80ff2c9adf2dc2eeabd93a545c84373902b4 DIST pkgcheck-0.10.31.tar.gz 379079 BLAKE2B b3e308a8d496c954d649677a41394b1fe1fbab43ce6c629616249306fafaad8e5c2cfa38fc9c838117f7abc381a0c04cea60ba5a2b3ab6a1612bbfc68d858832 SHA512 539cf262c950547dbd85441a7b40e76fcdc0810fdd633ab9042a13c7b19db4826c05ea1bbacf64b50c68884e31fff6a88e6b2baf94b2e6a4b2738123441da6ec EBUILD pkgcheck-0.10.29-r1.ebuild 2259 BLAKE2B 0106d3f25f757ae7c9e65cbf78c56411baab534885e67bbf8b368c5425f555e4be0cd8ce992725d53923a3014277d19d3658919d1dc038d9db2c0a6248ad23d3 SHA512 7e18f3e52ce912f0a9d267f3b1482bec81aee58609958f9699015ea22339aa153fcd2a8d49bf62c29e0901b317ea4dfd9c70454acedb176b7875095f5497950d -EBUILD pkgcheck-0.10.30-r1.ebuild 2255 BLAKE2B 4921f0f2d0d40c74c18553601bd2377c6a22ef7919c118e545a200a70ff28497c2e16b0304e8db3eefdd4f32b465b2c321204e895c9382fcb0fec4882553e40c SHA512 0b42fd121f42414a259618559a96c70b0770070e4cd033c3c5823eb0c470e91e4a1977abb0d36be6e66abcf12676222f90f751fd6aac412e7d5333523c23056a +EBUILD pkgcheck-0.10.30-r1.ebuild 2254 BLAKE2B 94e3ff89fcc6a8b08b35ad9c46f1e1d54e5f548da3a8b1e7c941d0315852d405a0a6e3c6f9260ac0bc4bbc7f374d94cbd3394c3db098dc7e194152d1c8eb282a SHA512 9e0488bf01869d88c8ac2978bba0cffe8ff96b331b94b2f8ce242fa4e84ba80f98271979fdf3f50bbbb0191fea4d1ee22be92f96fbcdc365f27631b5e79aa27a EBUILD pkgcheck-0.10.31.ebuild 2235 BLAKE2B 753d9c855cd97484254d400b597f4917e8e04de71d5b5fab8f259338a6ca0c2b5f73c360f5e4076ace2d56dc23ccaee839abf8ad91b777772ec5838b3d6e367e SHA512 2ea971efaa8869cdd0247264232b2cce08d2d6fc80e82aa8c5ce48371c0079fa62d766e8da90c0988ccee5c7c6f540ce9886f5315f8d701c5e33c5bc4b4957f2 EBUILD pkgcheck-9999.ebuild 2223 BLAKE2B 664fee3e5ed354eea1f55e852a6c8038f5eff0fb93ee2efaa3c24103e52246e9737df512f5a86af703174a22fe467aabcad7232701e13bab2423cd7cc2b50553 SHA512 a246781aeed620aa012da683f5969576a7069451ccdc0f036fdbf05c4765527a6169b04afc9f5942b3c6878508430a5117435dd57c1f1ac55cb4c63339a20f75 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a diff --git a/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild index 4ff9171a9461..976f2d57e469 100644 --- a/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then https://github.com/pkgcore/pkgcheck.git" inherit git-r3 else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" inherit pypi fi diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest index f91d451a7ca3..0733d6177958 100644 --- a/dev-util/spirv-llvm-translator/Manifest +++ b/dev-util/spirv-llvm-translator/Manifest @@ -4,15 +4,23 @@ AUX spirv-llvm-translator-16.0.0-llvm-link-llvm-dylib.patch 1755 BLAKE2B fa0465b AUX spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch 1163 BLAKE2B abd9247461c035790c6914c9719a44b30ef54a2d44246c58835af6349176341d1f1500d238163e4fe17406e6e36e701dfccf0d38729b85915c89f0618682e744 SHA512 374e7f701da543091e78027f0e4540e325c45c8b08d6ffeefc53337493aa76444e5b615c033ef198dd9422868ba0d8aec157a5f7b757510d05db02355d5bf15d AUX spirv-llvm-translator-17.0.0-intel-capability.patch 9322 BLAKE2B aa847ba0376fd78cd105b6dce4d785cb060f08a04da0ca52a12f689bbbb49b3eaec579669458e70c2b7f75b446752492e07cdc62c39e57e465532ce3f55b0cb4 SHA512 912ed2ffccb033c5bd7790e7d8e2f63437388375c17d8191a1fc4409daba9e2bd9e00ca3232ff4451f58fc430e040d7837f700f844c0a6fb14bfdccd61829a4a DIST spirv-llvm-translator-15.0.0.tar.gz 1515145 BLAKE2B 1f93b55f8934ce7dbc9416b82f7bd544d16e95be795047e914d0c303ec90965eae03ab3522b3c92d6cffb1fe00bed78a4bb74085d3da21c14b68ad3fbe53113c SHA512 8a6ddddf326dad96c1c5749ebf03e63e6be60592dccd307f7a35be668cec2b4f58c2f089854aeefa37398c3a97dad6bf92a6ceb892da27b5cf9d4ae1aa41dd06 +DIST spirv-llvm-translator-15.0.4.tar.gz 1598316 BLAKE2B f97a959b0dfb7c3ab6d24c72300b1ebbd70d98544c3f5e5b403aa412f5d599e9f846c6c9a4fce3c09a2a776cbb0349bb5b0112fe76fa1c6b0f7a12e139214dac SHA512 a19e3d20b632bcc623f6238e517b7a73ee99abdecc118fdda99972d22de2f74e7dbb880a726e2cd86ffd941fabaa8572f4130e409886691824eaa0e973d90a1b DIST spirv-llvm-translator-16.0.0.tar.gz 1542060 BLAKE2B bee72a776062266e60c5237396434ecba4e4da959ed52292ad08388bdd08d7749fd86cfac5c25af424032a1ba19f59b2d8c7eac0eaf50db6a4945841abe0836f SHA512 0bacacb89aa2b03d1173d1bfbcdd83fdce7441ebc3fff65e14dc5e901fc983861365a54c029b2a65075b6fa45046c30aa7bbad4e6150cf3382e7d050c598de98 +DIST spirv-llvm-translator-16.0.4.tar.gz 1589087 BLAKE2B 51cebc05fbc8ffc4d765b15a7dd5cc5b774002d4fed9e30acaf19e703f83bcecfaf7dbe7243dc5ed541e72613cf1800dd2f0f3b0f374b0619027f8171ac24b1b SHA512 02c3a4f443506a6a6015a1db7a57cf08242745d94cea27693929deb43bad6de18cf7152397454d295224818506b843fa7e537649d500e8f4b04fef9ec2333a4b DIST spirv-llvm-translator-17.0.0.tar.gz 1601166 BLAKE2B c3e7a78fa55cd13ba61c024e2d3d82c47ac9dbf8c11bcbcf4ddc34a6838fb948885a263fd9af2d0f404b31f4c6e9226c9582e0f65b3220770e1af07cf85f4dac SHA512 ee54e597c678755cb48d677f81184d66616c7be934b570e04f0106e64c15f1cab124177b757f08a7713fa7fce981c74d61304d4554e6d198e6c14c53abf1e81c +DIST spirv-llvm-translator-17.0.4.tar.gz 1631063 BLAKE2B c55c5160355b797d52f8368c2d780dc89b6f92108bf22a8de7232327b4cd1c12531766bbe061b5c23926a4a8fa55394fba23e573346cfb8a12261b3c8aeec67c SHA512 454426b3146348c5128e1e6663068f34a2babca5a90864d6cff7fe3bf997ad64cf916759ebd294b3b4c20d89b1f0914e2943554761968425f92ebb48f85d0d28 DIST spirv-llvm-translator-18.1.2.tar.gz 1694843 BLAKE2B 13409096e6ae69509a393741d674a89f5468797fd3ce51c06c69a766f1d34ba952b915013f1bc2aff3ea1524e863a81609d7179096a7b8141ded64a6b366546c SHA512 889cdc0960f6029129dad62f7afe6f61b51bed9d8fb9fa6b743318e2243252dce62cbacf71a2b56decec24ce37746b4b4787dd426ad76e2feb74e1781cb070c8 DIST spirv-llvm-translator-18.1.3.tar.gz 1700577 BLAKE2B 0d92c6259956db9cb4a49c521dff7cbc0c4353ac779372bb92efb8ff4b1aa61d11ec35b56059e9d4ef22170e6550ba6eadd50f07b97811a65c81113758efeec6 SHA512 b47f4ddd2f404aaaa23e7eabe1450e7cc622809fcb0fb8679647b0f06e6340d36fc63286120580277db59e5a95ad61f086d61072adeeb060a5964436dca97186 DIST spirv-llvm-translator-18.1.4.tar.gz 1701536 BLAKE2B f9326299bd239721752c2b8dacb7ad5b053e189aae2374848c581e3a6110789c4e4078c1efb69bf8fdd01b30df445821130e92c1285b9cb791dbd290f796d183 SHA512 f0f7e9c3e6544707bb20cbda523f6081be42f5acb513d99b326ed0753f8d285bfb301934fa7ea78fc60bcb5672306f0ffb8a7937cc731c2bb08b72f4b7f5ef61 +DIST spirv-llvm-translator-19.1.0.tar.gz 1751496 BLAKE2B 13fbd34642622721d0a2f46342e549e1ce0e654a5243a76b7b5b4ccfc655e764701015758cb9ce0ae0de64ae7625f6070bb40473b178d8fdee1d586ee86e296d SHA512 646e8d812390550469aa1f0f27c9a2af09a9c16f1e2a7ec3a952be88973f70eda5dae54251f0cfe955802b97579185d964d947c2ccc41e8e6c7a1a95908f0c42 EBUILD spirv-llvm-translator-15.0.0-r1.ebuild 1371 BLAKE2B ab7fb7701634812654c2b3410190715c581369550385ac275588fff286d02d62c17fc4a75f97ba4082a707d18d5eb55e38f2aac290bc4abe3c676da98ab04b53 SHA512 e58d8f2d6b9474d8426242f90a567dda559228e5e783a6dd965bfae20976008a468075ee615aaf4139a167dd13efb038a7d064dd2ca998899d6b4ba8cb07f402 +EBUILD spirv-llvm-translator-15.0.4.ebuild 1309 BLAKE2B 7c3b2dc390e943c7d4e3724051d5d7a35fff131f7cd8c45405e9e8a75e830aed749b24d8ec55479b816e333517071cb96cf79970401855126ebbbba6f1977c63 SHA512 2c00f91f76d0cfbd47e20a2c9c4376832fe003e9f1702175e1b6007946ad00c0f7d10f9323bed528ab65f6c340e13bd5bfbbc05a16ac6c8e455fea3edae65fc4 EBUILD spirv-llvm-translator-16.0.0-r1.ebuild 1531 BLAKE2B 07ae6fb702fe5bc915ab9f07cff253f7c6f2049e013f5d0d77a6d7ae020a8bfb9522b6159327e5684b9f081a48aaf467556d26c792ae65fdac6b16ad3b4b1035 SHA512 70bcfeeb07c2089a7b43f8df82492ea1aecd957fdf582cbd710b8484689796c11234369f3fd324222f3de1dffdcf7eccc482da387be962cfb74f96b18711e436 +EBUILD spirv-llvm-translator-16.0.4.ebuild 1426 BLAKE2B 4c23f74cab7885b0d5a4caa6f6458008694b8a5251b046c9239192c8622a540afeeb227bec77e1bf62a7c76df89a3372467b1597cb53ca2d657f12d14d7362d3 SHA512 89f458c6a802525348981d9cc9584de9a35d93586505ff03615922bc8151ee67ed022519079c5a3c18710cec73864c182d9917391e9c63abc020931525f51063 EBUILD spirv-llvm-translator-17.0.0-r2.ebuild 1512 BLAKE2B 9e642681cc67196b91532b36b44ec2817161d25423d057f6bd91fedacada2e33d12946257ff54c337143d0fbfc9d11f29816cfb485404685d209be906e75097f SHA512 96961a3225f9c10eb317741b39091341e40202e07b7a07434182e78f9b8ce5451f44b6ae8011d7e9f95b640157f2a5cf04c56b77d6b5647c806dea6fb09c97f1 +EBUILD spirv-llvm-translator-17.0.4.ebuild 1380 BLAKE2B 71ec2500be77a527a0b43ceaf5802ca523510a12e38cb6eb02a423e8701c2ad7aeb9973d00fe9d4f5c8dc75704fd74db1417c7f2baac86365b09afa932aaf429 SHA512 02e3251e460a6cd61e2c88cb5ba610a30811d6c8e452e19e79b082032c8c205ee92be733fc974dc705033c3c7871624a199ea0bc1dcd57e4cc4941fa552a23da EBUILD spirv-llvm-translator-18.1.2.ebuild 1390 BLAKE2B 26808cbccd8d7059134bf78f8846f09c3f8ed85c3153cb10659c01fa3240df851dbe9d9811821b83a2ea7e25f17d8fc1fe3595ca1a0a111c4d41e5a0029772c8 SHA512 78f8439a0fbc203e1723cdb9deb1eafad691cd3a545a9a6f0a530716df020a28d74bb74b529e7129d1c0d301f302fe1b5cf46040f56a6107013e3f18419a89ff EBUILD spirv-llvm-translator-18.1.3.ebuild 1377 BLAKE2B 388557ee71b5d4a2fd883137918cb48855818dfff1496f6268ae7cc9c45974ade8f3c76f30474e618d51bec497b1630b185884652f5685d423e65928d0ce6e5e SHA512 31352669defe25bdd064ff1bcec3b479fb72010a10d4caac39754e4d1d6190a7a04cfdc4e24f8348f98e68e085bc6ff8cb127cc5f42987fd494937414b031395 EBUILD spirv-llvm-translator-18.1.4.ebuild 1446 BLAKE2B c6ba1d1876abc6d5eb5466aae1da25168fbc914283b88ef90a9d32fa05ab1d938f752e1fe643de6e932dc46b6a91203fbc79ae84f5489ccba689f0b81bfc63a4 SHA512 8da04df1a765300c894f0d3d7c75e7a78ffe6798ba7990f284501def153e6a8674103c7c587dc0ccded32eb17d8e25e2bf3aadb8620f7a3341dfd075c72ff854 +EBUILD spirv-llvm-translator-19.1.0.ebuild 1446 BLAKE2B 529248c50bb68a7011a1ef47f5673d560cd89f3e8a36b3fc2ca8eead54a1b4208b7f312730a79d5032f449f64d55fe0b34332639afc4bbdd1045154f04a75c80 SHA512 91d302e70a233fff66a963a34bd875032844dca38069fbdf1fe6e6fcdd8b673a13cc13ae14e9b17bceab46a20792d89a16cdecd5f4b840d422da3b06e6ee6d7f MISC metadata.xml 445 BLAKE2B 11c5d6b6e94192c6fe1aa0cdce39ddb6e3e0aac1462533b5480136c415cc5d82ac77c4930a07a234d0ae987d3409c8dae590f0d5b99139282a89939d0b65cf4e SHA512 e58ae0f86f23be399eff43be9b90006f9be0f699af67f354f2e5434bc0fd43856863763192e0270fd06f7df65e0bdea2bd0b9d43b5b200d8a0399e0230c86e71 diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4.ebuild new file mode 100644 index 000000000000..f7eb7d04ee67 --- /dev/null +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT="15" +MY_PN="SPIRV-LLVM-Translator" +MY_P="${MY_PN}-${PV}" + +inherit cmake flag-o-matic llvm + +DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/spirv-tools + sys-devel/llvm:${SLOT}= +" +DEPEND="${RDEPEND} + dev-util/spirv-headers +" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-python/lit + sys-devel/clang:${SLOT} + ) +" + +src_prepare() { + append-flags -fPIC + cmake_src_prepare + + # https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555 + sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die +} + +src_configure() { + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv" + -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") + -Wno-dev + ) + + cmake_src_configure +} + +src_test() { + lit "${BUILD_DIR}/test" || die +} diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4.ebuild new file mode 100644 index 000000000000..915d4235fe88 --- /dev/null +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT="16" +MY_PN="SPIRV-LLVM-Translator" +MY_P="${MY_PN}-${PV}" + +inherit cmake flag-o-matic llvm multiprocessing + +DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/spirv-tools + sys-devel/llvm:${SLOT}= +" +DEPEND="${RDEPEND} + dev-util/spirv-headers +" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-python/lit + sys-devel/clang:${SLOT} + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-16.0.0-ld_library_path.patch" +) + +src_prepare() { + append-flags -fPIC + cmake_src_prepare + + # https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555 + sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die +} + +src_configure() { + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv" + -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") + -Wno-dev + ) + + cmake_src_configure +} + +src_test() { + lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die +} diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.4.ebuild new file mode 100644 index 000000000000..096ab829dfbd --- /dev/null +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.4.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT="17" +MY_PN="SPIRV-LLVM-Translator" +MY_P="${MY_PN}-${PV}" + +inherit cmake flag-o-matic llvm multiprocessing + +DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/spirv-tools + sys-devel/llvm:${SLOT}= +" +DEPEND="${RDEPEND} + >=dev-util/spirv-headers-1.3.275 +" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-python/lit + sys-devel/clang:${SLOT} + ) +" + +src_prepare() { + append-flags -fPIC + cmake_src_prepare + + # https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555 + sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die +} + +src_configure() { + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv" + -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") + -Wno-dev + ) + + cmake_src_configure +} + +src_test() { + lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die +} diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.0.ebuild new file mode 100644 index 000000000000..69a16f04bd1d --- /dev/null +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( 19 ) +MY_PN="SPIRV-LLVM-Translator" +MY_P="${MY_PN}-${PV}" + +inherit cmake-multilib flag-o-matic llvm-r1 multiprocessing + +DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/spirv-tools[${MULTILIB_USEDEP}] + sys-devel/llvm:${SLOT}=[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + >=dev-util/spirv-headers-1.3.280 +" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-python/lit + sys-devel/clang:${SLOT} + ) +" + +PATCHES=( +) + +src_prepare() { + append-flags -fPIC + cmake_src_prepare + + # https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555 + sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die +} + +multilib_src_configure() { + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)" + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv" + -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") + -Wno-dev + ) + + cmake_src_configure +} + +multilib_src_test() { + lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die +} |