gentoo auto-resync : 03:09:2023 - 10:18:27

4 files changed, 86 insertions, 0 deletions

diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index a150a1063115..e78b214bb36e 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,10 +1,14 @@
 AUX rocm-device-libs-5.1.3-llvm-link.patch 694 BLAKE2B a67a1207bb23ceaa304f2fd59000a14a8bd232fd6eaf3510370f148b0bd18630ec4309a3d2ee2c5b8045114841a0548e840601abb153fb4adfc1209dd16b0509 SHA512 75f6fb5f3aab7f7951d110b9097a1521adb261f286b5e04867fd2753bbfcc29987440fd929c9dac0ac90fde98616ce7693c2b5041d4d07c437087ee17303a22e
 AUX rocm-device-libs-5.1.3-test-bitcode-dir.patch 1181 BLAKE2B 0358dfc81ed98acd2a2bb399b7d8aa72c2a0bf20da3c45ad02d5e1c46df7f98bc18efe28867725e0fc1df041c1f1147bc25a2a5aa67b18f53d859dbf66aa71c7 SHA512 a0ffdda4ab42978f3b09bab424f91267bfc267f751d489aaee9c6eb3979ae5efd8130129e4b476fdcfbc73b779d9aad79fda60a8f7a64e8a5b35516d8fe6979f
 AUX rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch 6801 BLAKE2B ae3be5c1d8a7a84e8ddee2471628804365dd1d9b1ae3aa981b5e47015b82c115d5da5ea6fedcacc3ccf11c768af8130375493fdbcc9a53567e633cc57e7e750e SHA512 c28a08253025b150523282231c64e5d310206e6e406efdc2a0f39ce69b2f1663fed6991e27b2124eb3434c51efb8d172eceb752f366bc2aab7b3eb63ad9dfa35
+AUX rocm-device-libs-5.5.0-test-bitcode-dir.patch 985 BLAKE2B a47bb820cca7a727453f9888a018065dfe679e7c23cc91f1d1ee3cee21f6c2fb47b23abbaa917ee3ef74d567e0f853efed4522ec1d03d76a5170b7ff018a196c SHA512 39524b263069f86c40051db9cf21ebf78b2a72739e08c0a5564ea352f7206f8b32f4715f1c322a8f8b43dd86cf3c09e0677205bb2ada0775f6b6cc7ec0555f8d
+AUX rocm-device-libs-5.5.1-fix-llvm-link.patch 681 BLAKE2B 1f28e1c92295caec2b50d576830ba896b82c92fe93db9243e4f397c9fde2de090e3f7f8c13ec8a0371d95978807642b433f4dc8b1644595da7f7576fe6b12a35 SHA512 6205cdb17692b4ebbce9f6a0e910c50ed9bd628d1863716f98e87857002399a3edbec3b9c50291c453262d0c169ed62ada5889fb1c735af04fd97623514e1fb2
 DIST rocm-device-libs-5.1.3.tar.gz 242862 BLAKE2B 68d66de897f461e9f876de5fe2214803d4c00665651dea6af0952f0ce579c6704a5ec41b08971fa613ade309a0a85cb611b56b592dc2a25e247183e634ea3378 SHA512 cc3dfb8d4b4841ba777355c537175259d0019159ff462358320674b85082cccd99f6462f60fee66228ddfb88fade043445c1bac62504aa1462ba61b7e2751de7
 DIST rocm-device-libs-5.3.3.tar.gz 245690 BLAKE2B 475c0d818b8b0f090a8daeca2910cd4002e4cdf505d020327f46eb5f864a26937a6a3dfe4ff7b188ebda0f936b1c396f2163bb27b9e2a62c5976e60fa60856ac SHA512 8f6f2fc1534e348e02ba30a25cfc6017f8eab768968b5d0344a5ea7d65c4f0a874072f9e53919c74545814330602ef7c190753c7ff019137230e02f58a5d3a5d
 DIST rocm-device-libs-5.4.3.tar.gz 246095 BLAKE2B eb749346c96d465a5f22831968ccbd71f02749e6aa0d9c2becc0f378641ca0f65c1a131bfd3ed226f838b4208091fcc920b1e31b427adbd69a42881898668e6a SHA512 67b904363a3cff6c15bbd032cbc72cb5cd5f82acaa68c74391dbcf415266e8f35486a496b69b69e1fc0721e0e4e21fb6a6b9c180a46cb59cdcf53916be846ca4
+DIST rocm-device-libs-5.5.1.tar.gz 245900 BLAKE2B f713b1f12c7be33a4854d79791f592b8e89e2bc463769ec8cdd807483f0e5ca93d7fc852b6cf41d5ad0401d07adc97de9fb1fa54b77af83f665e282d6c0a43e7 SHA512 0138ddc94ce4a81202bdafccbbecef8145c6ddf82c3a14d92bb80b2bed3d3b73898f84279cef89110c50a9cc51e32de1323cc11a1f97c5da4f7f843b393425d0
 EBUILD rocm-device-libs-5.1.3-r1.ebuild 1184 BLAKE2B bef07c38844eb218c333cf2fb0014881aff83837092dc62aa29d4971e9782da6a38a7db2dd599f6c8aff0c2bd60c94550d72300d8ee2a6db4ea2688820035803 SHA512 814009470618c7cea132ba28d3aa27eda6a55d65646efa54fc3ce0aa11e247af147f175956d2f7466474d891dd5aef80fe9adcc6bf871352d6f7c20c7f802832
 EBUILD rocm-device-libs-5.3.3.ebuild 1184 BLAKE2B bef07c38844eb218c333cf2fb0014881aff83837092dc62aa29d4971e9782da6a38a7db2dd599f6c8aff0c2bd60c94550d72300d8ee2a6db4ea2688820035803 SHA512 814009470618c7cea132ba28d3aa27eda6a55d65646efa54fc3ce0aa11e247af147f175956d2f7466474d891dd5aef80fe9adcc6bf871352d6f7c20c7f802832
 EBUILD rocm-device-libs-5.4.3.ebuild 1250 BLAKE2B 6013dd693a8120b5eeac654c9bad195428c34059eaef1bd40eaaf856f2edf331d8a3726fa46c077fe0aa62919f3ba68f518cfd9441d23020a06c293cd45f1042 SHA512 df101563920183c6a255f1461e718e28a01b4db355e3807c5a3e7b948627337950105deb7f77a857d489d9591c959909ad1e1957e4f21e3dffba08ee14514469
+EBUILD rocm-device-libs-5.5.1.ebuild 1206 BLAKE2B 4e40b4f468a1f3f2bba04aff69de95796f4df079c737b17812a979531a70d62da394655e00d1956d2dd55248141b255a293c1e19fd189e0df3e168f2da9d4d1c SHA512 98a5d239e61f5690bed1af56f8d38f9e188d2f9a3e5c0409dab1afeda7b825b114037e5319daf650ba75916a15c16fef8bb3e61c63ef60255bfea95b4d34d44d
 MISC metadata.xml 378 BLAKE2B d4defdfb2ce3bab811d9c2ac75b92b7892d46d87dad9f89c26cde140b3b167b43bf4022128dee45e063e332d6dfafc3ee8d78b0112909a7ce2d4a4a44c6cfa14 SHA512 0732d51019f0d27ffb1ffea32d76cad8a6d82927cb8788ff983cdb8dcc472015dbe36ba568bda7459d0b32837e89e1a32064ab7dfcefd2b88458cbb4438f452a
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch
new file mode 100644
index 000000000000..79b61d1517e0
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch
@@ -0,0 +1,20 @@
+--- rocm-device-libs.orig/test/compile/CMakeLists.txt	2023-05-02 15:23:15.413157017 -0000
++++ rocm-device-libs/test/compile/CMakeLists.txt	2023-05-02 15:32:10.411515448 -0000
+@@ -30,6 +30,7 @@
+      -DFILECHECK_BIN=${FILECHECK_BIN}
+      -DOUTPUT_FILE=output.${name}.${test_cpu}.s
+      -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${func_name}.cl
++     -DAMDGCN_BITCODES=${PROJECT_BINARY_DIR}/lib/amdgcn/bitcode
+      -DTEST_CPU=${test_cpu}
+      -DEXTRA_CHECK_PREFIX=${extra_check_prefixes}
+      -P ${script})
+--- rocm-device-libs.orig/test/compile/RunConstantFoldTest.cmake	2023-02-01 15:17:33.000000000 -0000
++++ rocm-device-libs/test/compile/RunConstantFoldTest.cmake	2023-05-02 15:33:44.634752384 -0000
+@@ -16,6 +16,7 @@
+   -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
+   -Xclang -finclude-default-header
+   --rocm-path=${BINARY_DIR}
++  --rocm-device-lib-path=${AMDGCN_BITCODES}
+   -mllvm -amdgpu-simplify-libcall=0
+   -o ${OUTPUT_FILE} ${INPUT_FILE}
+   RESULT_VARIABLE CLANG_RESULT
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-fix-llvm-link.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-fix-llvm-link.patch
new file mode 100644
index 000000000000..f965045b7e7b
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-fix-llvm-link.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/851702#c4
+Adapt to libLLVM.so instead of the seperated libs
+===================================================================
+--- ROCm-Device-Libs-rocm-5.0.2.orig/utils/prepare-builtins/CMakeLists.txt
++++ ROCm-Device-Libs-rocm-5.0.2/utils/prepare-builtins/CMakeLists.txt
+@@ -26,5 +26,5 @@ set_target_properties(prepare-builtins P
+   CXX_STANDARD_REQUIRED Yes
+   CXX_EXTENSIONS No)
+ llvm_update_compile_flags(prepare-builtins)
+-llvm_map_components_to_libnames(llvm_libs support core bitreader bitwriter)
+-target_link_libraries(prepare-builtins ${llvm_libs})
++llvm_map_components_to_libnames(llvm_libs support)
++target_link_libraries(prepare-builtins LLVM)
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild
new file mode 100644
index 000000000000..6d104bcdde4e
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake llvm
+
+LLVM_MAX_SLOT=16
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-devel/clang:${LLVM_MAX_SLOT}"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4.3-Revert-Update-counters-for-gfx11.patch"
+	"${FILESDIR}/${PN}-5.5.1-fix-llvm-link.patch"
+	)
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake_src_configure
+}