diff options
Diffstat (limited to 'sci-libs/rocFFT')
| -rw-r--r-- | sci-libs/rocFFT/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/rocFFT/files/rocFFT-5.7.1-fix-rocm-link-path.patch | 14 | ||||
| -rw-r--r-- | sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild (renamed from sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild) | 24 |
3 files changed, 34 insertions, 7 deletions
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest index a973e940fb99..25de558512b6 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -2,8 +2,9 @@ AUX rocFFT-4.2.0-add-functional-header.patch 426 BLAKE2B 82c289bb6663690163c1195 AUX rocFFT-5.0.2-add-math-header.patch 468 BLAKE2B 66cedbbc2b7aeaa2e42324e02325dc3f0c8869b109cdeb46892d597346532dcae2bd51739b85b97ecb6982935ec38f1332a4857d719b1c7c9e3a1e83f60623d1 SHA512 f714ba071838ebba8c6ab32b92eab52430622ef5f7eeea04f7a8c71b8a2a547688faf0f8d93a9be90183aebb976ec51722bcee81d960545046c82fd3df9b6f01 AUX rocFFT-5.1.3-add-stdexcept-header.patch 340 BLAKE2B b21454151dd2c41948e00b50360b3adbc93c08e7e849b11c032ba0b8dc76d1159883349065d7c87bf3098d0e67d4da48db220b58934de39fcb3c4d006a902a5e SHA512 a49f2bad5ea87f67a7d5dc7adb820a42ab2b92b0f1436a564c3906dcc4598de154d18247d8b4e8f3e12c3947da05890a4a9ba6f76852bebd1fcf26928ee48e0c AUX rocFFT-5.1.3-unbundle-sqlite.patch 2326 BLAKE2B 5a08f2ec7486f0687c4af46e09a01678e8255254bb78ae864436353d10017f86f1b3b557527a32771de43fa24148c3be5d233639bdf3e6746b2d120623bf934d SHA512 c545053741c55abf1dbcda89e9ece1bccb42a5db86c0329499b332299c5c7b73150650634cc7506bef2ee7e16a25bf1aacd5477bf13884e2cb01c48a113b33ab +AUX rocFFT-5.7.1-fix-rocm-link-path.patch 492 BLAKE2B daf4d865d8b2b5f3dc97a845f262c266588da910f517e31a10cf7896c6bc1c4fd794c01be39c7aa74d5eb80e4066b8d3dd8a8841210e0075ad4e593dc0f85f66 SHA512 b715c08515b6d289f1b045db7053ff08a27aa9cf940beacba47167a72f168d75f4652d98b33fc2bef303832f0689cf51d71f893e415ba4b4cd7a0f21c677de69 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43 DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f EBUILD rocFFT-5.1.3-r1.ebuild 3921 BLAKE2B 98eb96a54b1f73e0674299da7300c68ccee073a9a87a27213f865d8cc0b229078416b7fb4a98ade73ea13baa59d3e57c3117c457e59e710177287d726fe6f189 SHA512 a3feeec5c089171f6476bcfe5f1a8d154a1117be087f57151d4efc4403dcefb689dfee8241b7ad3651c8b008106314a7f5f8ae65a5147cc617beef1e63b1b803 -EBUILD rocFFT-5.7.1-r1.ebuild 3695 BLAKE2B a9d350012d221c762662ef87d36aad5d9a0754e96620558c868ac81f9af9ea92f6ea52b568dd4e20a3127bdf26d2b4a6d3ef976c0b103339d39a5dc93c0aa879 SHA512 c74a0555cbd1b0e8897b56b1ee29a31a8925b0cbbb0865e586347568a3f48e4f9fc8286fe8ef6999453bb913e1d4990a48630159fbfb32defb3010b962361e22 +EBUILD rocFFT-5.7.1-r2.ebuild 3945 BLAKE2B e663c5ef2aa609daec68644c943a4b4dbb7963f1506ef6dcd6c907c0b2bf9f5cddb768fb7e37503e5aba02c998655785bb44412205e2c5575fa95cf9b98a4dce SHA512 f49656ba5e5691bd83a3e18c22c343b254bafe3b8ea893b482e32421e6612cd4cb3cf14607751ffd78f8b0bfe56057ad563b624e27036a80b4db4b6e02f94fe9 MISC metadata.xml 676 BLAKE2B dbf1364ede458c08dde2ebd4a8ca7053a1dc00813f647fc09268ef5a97150945c19b2375f13cc74aec8ff0af831625221bfa675b5ded7769ff5e1a322ae8b5dc SHA512 352c744ece6202b976170615927c09b82513a73669cd5efc5ca626ac2b6929d18f8ecd0b8a91d87bef86aab17713158f1e7efaef0aee01b7ac6e7d6cd2a3a4f3 diff --git a/sci-libs/rocFFT/files/rocFFT-5.7.1-fix-rocm-link-path.patch b/sci-libs/rocFFT/files/rocFFT-5.7.1-fix-rocm-link-path.patch new file mode 100644 index 000000000000..03731516d8fb --- /dev/null +++ b/sci-libs/rocFFT/files/rocFFT-5.7.1-fix-rocm-link-path.patch @@ -0,0 +1,14 @@ +ld.lld with "-L/usr/lib -lhiprtc -ldl" fails in attempt to link +64-bit library to 32-bit /usr/lib/libdl.so.2 with: +"ld.lld: error: <...>/Scrt1.o is incompatible with elf32-i386" +--- a/library/src/CMakeLists.txt ++++ b/library/src/CMakeLists.txt +@@ -46,7 +46,7 @@ else() + if( WIN32 ) + set( ROCFFT_RTC_LINK_LIBS "${HIP_PATH}/lib/hiprtc.lib" ) + else() +- set( ROCFFT_RTC_LINK_LIBS -L${ROCM_PATH}/lib -lhiprtc -ldl ) ++ set( ROCFFT_RTC_LINK_LIBS -lhiprtc -ldl ) + endif() + endif() + diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild index 0fba2a7508a3..f4ddb494bf35 100644 --- a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) ROCM_VERSION=${PV} inherit cmake check-reqs edo multiprocessing python-r1 rocm @@ -29,10 +29,12 @@ perfscripts? ( dev-python/pandas[${PYTHON_USEDEP}] ) ${PYTHON_DEPS}" -DEPEND="dev-util/hip - ${PYTHON_DEPS}" - -BDEPEND=" +DEPEND="=dev-util/hip-5* + ${PYTHON_DEPS} + benchmark? ( + dev-libs/boost + sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] + ) test? ( dev-cpp/gtest dev-libs/boost @@ -40,6 +42,9 @@ BDEPEND=" sys-libs/libomp sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] ) +" + +BDEPEND=" >=dev-build/cmake-3.22 dev-build/rocm-cmake dev-db/sqlite @@ -54,7 +59,9 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/rocFFT-rocm-${PV}" -PATCHES=() +PATCHES=( + "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch +) required_mem() { if use test; then @@ -135,6 +142,11 @@ src_install() { if use benchmark; then cd "${BUILD_DIR}"/clients/staging || die dobin *rider + + if ! use perfscripts; then + # prevent collision with dev-util/perf + rm -rf "${ED}"/usr/bin/perf || die + fi fi if use perfscripts; then |