diff options
Diffstat (limited to 'dev-libs')
13 files changed, 210 insertions, 17 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 45b599ddc852..dd0a501e7d38 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/hyprlang/Manifest b/dev-libs/hyprlang/Manifest index ca2e63626454..ec34ec65a75d 100644 --- a/dev-libs/hyprlang/Manifest +++ b/dev-libs/hyprlang/Manifest @@ -1,5 +1,7 @@ DIST hyprlang-0.4.0.gh.tar.gz 63245 BLAKE2B 79eab1d27c793965e9974cd73e7e4e433f3153c631665acae3866f3181f83dfa774e2728b0abde18926b26a0341b1548ab5d45207b7f3094c4f9e5d01c18f9bf SHA512 f25ac8f5667e7c6600916fa730dcb66cef0f86ebedd7157e94691f3e46350f628d68a3974916c09d709bbb89582d66cf5c707ef263f20964b2f205972d72ebe8 DIST hyprlang-0.4.1.gh.tar.gz 63616 BLAKE2B 7fc9fde1411ce1fec4328724dd51d3a1ebcbb95850e10f0316cf70307885d7ab6b797836c77462bd3724367b3415457c89b6c7593e1ec9dd671500bd4cf0cffc SHA512 2424d2b2d137b83b42aa37e6b31267a46e285dde0df1f600a3aa85f38117d1feaff9bb1884e266ef61c46b0bb02544a8b265329158eadd110962c5c03192e52f +DIST hyprlang-0.4.2.gh.tar.gz 54441 BLAKE2B f87c91ba86fa1e7af1d895d00f537fdd3f3c379a4dd06761cd9bf032b751ee69d9a46863b823aa42cf8d4c0e7e07f543ee583f7ac4978911374f34cce640ff72 SHA512 4e98fa369130f4453d270053d5b3a36587ab77b2948125cffab59ac00267ea43aa5368d177e5862ef57a3c8471ad290889b83cf82ad08fcf35872172ee128963 EBUILD hyprlang-0.4.0.ebuild 375 BLAKE2B f231c2ca6cdecc0655a785c7ddce4c1b9b6989a2c0fae33ec482b6c0daf6d47b1bfffe1ad2e499936b7b1afb53c9526c955df237ea92844c23924eb632c912f8 SHA512 51c41d78e3e890e2dd211b9c1ef768c31d86491db1fca9d506ccbd931146310ecfdc86dfe27c263b07615deb9f9697b953be36e078bb75b17e505f0157bc3a4d EBUILD hyprlang-0.4.1.ebuild 382 BLAKE2B f0df5e29355f1080e71b9dc77f0b2d6871cdeff060d88e451ea92290014988027b81a7fa889f2cad4c5f34766fa209c6a259e934fd669d45a058dc58e113083e SHA512 3800c9275b7c39b9b0d7a63e9173a2896a83bad5f4128edfb946964fae0047ce1e2799c0f522f861eaf6c7928663ba655b50f8d54e8f2d0f844510b0184733e7 +EBUILD hyprlang-0.4.2.ebuild 382 BLAKE2B f0df5e29355f1080e71b9dc77f0b2d6871cdeff060d88e451ea92290014988027b81a7fa889f2cad4c5f34766fa209c6a259e934fd669d45a058dc58e113083e SHA512 3800c9275b7c39b9b0d7a63e9173a2896a83bad5f4128edfb946964fae0047ce1e2799c0f522f861eaf6c7928663ba655b50f8d54e8f2d0f844510b0184733e7 MISC metadata.xml 827 BLAKE2B 8f87cba8df9407ad257e7fc1bc899dca305edbb244942516761dcb0ac6d39467dd6554e4a8aba86c10ed97f9ea4de682cd21cc832337d729c70fd650bdb60b9c SHA512 138e28bf3ddb9699f04415bc61be7d777b1e5a73bfb7de83d9e05b81629b624f8f2a8b1152bded3e4c68988235e3cae0b9aa9274d9406b466bbe3da894a54095 diff --git a/dev-libs/hyprlang/hyprlang-0.4.2.ebuild b/dev-libs/hyprlang/hyprlang-0.4.2.ebuild new file mode 100644 index 000000000000..4c7b562223db --- /dev/null +++ b/dev-libs/hyprlang/hyprlang-0.4.2.ebuild @@ -0,0 +1,14 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Official implementation library for the hypr config language" +HOMEPAGE="https://github.com/hyprwm/hyprlang" +SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~riscv" diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest index 3aaffed3c701..14d43525f60a 100644 --- a/dev-libs/libuv/Manifest +++ b/dev-libs/libuv/Manifest @@ -7,6 +7,6 @@ DIST libuv-1.47.0.tar.gz 1316016 BLAKE2B 6c530f8625366a9bf3f99ac4eb6b3bf3d4f6a05 DIST libuv-1.48.0.tar.gz 1314877 BLAKE2B 7595797ab732109516ce280fa2efa3474e82e78890087408c7f5b1457ce8f44e53878581bb8d473795e298d7390dd8a269dd2e8970e10b50a2c0bbe1cce187cc SHA512 7ae3a4c02f654a26056db1541e52ccc4c54aaea39c33585f0cf6949af997d0a0a29f30a294c8df6e92f6f6af7ce64c2766b1a2cc67f342e3e139cd55b7326c94 DIST libuv-1.48.0.tar.gz.sig 833 BLAKE2B f0982f7723fa81afe3fe668fc4497fb182a6093f38b185aba4f7359a3248062e7953acaba3f7fd739c9ff5b590664e4b7b81ee138442ffccd46c989c0a10345b SHA512 3a6441bb250badb7bb54a102dd7a1cf47ee4e0ed93ff0369c5b6a4b1e5440e613d85530f19c9ebdc586a97dfe1e06af09e2f90c13448e875dbaee1c703efa955 EBUILD libuv-1.47.0-r1.ebuild 1280 BLAKE2B 3b746be0855aeb9e47439ae4fc9ca9085e9555ea0047a44082c7bbda3dc5a0d29a2e10b7a50b4757f19d2f7303995ae361004c484e6a66ed6df4b43ea9bd74fe SHA512 6b317c2692a61bb66b0d6acf38a5f207388ac7e16e266071e2c7ed852acb5b54590d26e6bdc4df9fd1b76abf1d397cd0dcf025743393134fa129ccab19080ff6 -EBUILD libuv-1.48.0.ebuild 1498 BLAKE2B 7a06bf7d3080c66fd5e835b4f091840fa4adfafec07365540345c27bba4f9a4f10701d8652d0a30b2bca581bd062608b841849bdf5ae96b436b72437c49b5232 SHA512 53ff7dffd61e9e03c8ca5750c44f0de557a3a9bf195bf03d5530fad917f20eb54c566d2eb57284c0010852d02a42a6dd3adeb40b49c9c95e017196e031887e81 +EBUILD libuv-1.48.0.ebuild 1497 BLAKE2B dca30e84504af3895da8a997eb0cab00ca606ee2a0d46a36175b1262cc7ea70926ddfacfd61cb0a584832b084158dd21d061712465cf89f59e89fbc7e85565ac SHA512 bc675df7ae697bd7a1a939c55c96a389130d3ff4395dfeb2123b9e94b3e651c657c965d8640a5173f05401d72b50190e16f151f6eb86bfc35c216a2439b847c9 EBUILD libuv-9999.ebuild 1504 BLAKE2B b7c9fa73b817d274d81c22386e32d77f7ac110a313d7160ba8dfd96fb51f9cbf88b14027e055f23a651ce2825289a4aa36a026f782610a0881fb0dc308e55178 SHA512 c3311bc752c533021f23d62f490fddc623193088c21d166b91901bd5fd1a3da31d379be850daad7fc427634b715fc86ae837a41ac9e9aa273ebd67ccf6eb1153 MISC metadata.xml 1426 BLAKE2B 79a040706bd2e88560fdf7cdd75226c51384f1b27f8f86798f3a694d1d4b02ce309edef4f1921f73e498533e37deff9051ebdaa6ae565defabe9d4546aa33bd4 SHA512 a6fa2c3217de06d7d324b37b00e0cb19e8d0b192cd10736d32f5d459c701c14a6aa296d7d4d292f7c56120953423df0068f3f71495941295c97e86c283b084d3 diff --git a/dev-libs/libuv/libuv-1.48.0.ebuild b/dev-libs/libuv/libuv-1.48.0.ebuild index e6beaf7582e1..882675f3e90b 100644 --- a/dev-libs/libuv/libuv-1.48.0.ebuild +++ b/dev-libs/libuv/libuv-1.48.0.ebuild @@ -17,7 +17,7 @@ else https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz -> ${P}.tar.gz verify-sig? ( https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz.sign -> ${P}.tar.gz.sig ) " - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" S="${WORKDIR}/${PN}-v${PV}" fi diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest index df4fef57f7a3..5b45191c1e1d 100644 --- a/dev-libs/rocr-runtime/Manifest +++ b/dev-libs/rocr-runtime/Manifest @@ -1,6 +1,7 @@ AUX rocr-runtime-4.3.0_no-aqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca AUX rocr-runtime-5.0.1-cmake-install-paths.patch 2744 BLAKE2B fbbecdefbfabcbe4cd7f029e10d6abed94b492f94157839336adf83e98efe5c0e93dbb20856ca6adab32cb315bbd7b6c397c8fc48b66ea784cdbb3becb5f718e SHA512 db7ee8b87b526991a62c3cbfd385e85d27e05ba9a7f4726e8060d7ad29917e154bdcd0715e61a08210dad4b6112c731dfcab9e9f7e809b74da2f74c62a1eab72 AUX rocr-runtime-5.7.1-extend-isa-compatibility-check.patch 3006 BLAKE2B 91de5e4c427678aa8623c1663dd044a2fde1f46ff450d167f516fb618ccdfe71713f3309146766350de171b43ecdab82fa7cc89ccf9bf2481b7f0c6e724fa8dc SHA512 2646741d75829ca22a142f520635586312884617e1747e53b9fa1e0f226e5ab7353b99c905a8cc0d6eda9bd74fb763b5e38e66e1ca342375444744393268c18a +AUX rocr-runtime-5.7.1-musl.patch 3609 BLAKE2B 563a831a23f8d9515cca9cafc67355e631714c1f3f1eb02de02dd463db3da29cf75b055a8d3cb123a50039540941739e77a16dbdf8d16253785bec31e1577ad5 SHA512 99939293225a1015c280bbf1a01ea8e4cf53c2370ad940fa3b73c87ba84f87d24cd635e7dec4b5b6c28e25adc5ff6ccd7bee4ddec53e6b10c21bc7d9ae6bf73d DIST rocr-runtime-5.1.3.tar.gz 720567 BLAKE2B bdf2d258ec607ffc69264d48ce82c36787757b7809397d643a24abaa852f3cc217a57210fba760d4d11ef8ce2922dc1ef275d3b47a4bebc5c7b204bbbb5b7c66 SHA512 d47523ea2fe32fee832ca19b56a091f52e16b366db1c571f87e5599514b826376d49281e79ff0936dcaf7349f9becbc8ae9b3e9472a9c3e14b62a3f98d541b35 DIST rocr-runtime-5.3.3.tar.gz 809871 BLAKE2B 1a44e88c34fcebcea3351de812f2ac64a7b151303c5bfc4066920755c185731388afff89c705afee6010d262f68358a20b1c0197e8f23c22ab24409eb55fde0a SHA512 27efe57954575549703b31c4a632548bf3d82df0f01d5f15485d0bda7efa6ec2ad0a4a8710b8f240ff57296eb62d3796926e32d16dfe448b188d8264fde0ef8b DIST rocr-runtime-5.4.3.tar.gz 811062 BLAKE2B 4ee8ef49cdac7f6918db3aa96089852847d093aacc11ed7e7157a6eb512cf36a3d37396670c14ea24b16b1127c4547977390694d05bc6006ac48b40e707d6dae SHA512 29f13a1b16ef457071cc050227d57cda92992f416ebc074f8cd5a856d9bd76fd34ab2ccb53c21c3d798165282d44bba287ef44a9d1da327ee198e1facc77a4db @@ -11,6 +12,6 @@ EBUILD rocr-runtime-5.1.3-r1.ebuild 1489 BLAKE2B bddcaa60234f530822d4f96ea90c4c1 EBUILD rocr-runtime-5.3.3-r1.ebuild 1556 BLAKE2B 4554d25ea988cb2c4b0520691544525288cb57dbaf53b79e06552f3f3c508f52efb9a796f8f1b4fca6e98984ad56ec6c29f50b1777a7f324d0a870ef911a3773 SHA512 861e2b6f917698fa2a0a6bdcfe988c18a1bd2a7b2f5a036cdf09af161b244534ce0daa596dc2a5073e586132a14fdc58128f867f83adeef31355402de607db30 EBUILD rocr-runtime-5.4.3-r1.ebuild 1767 BLAKE2B 56cac1aa980f509aace3c24344384375f6896f889d24a48ffed04db8f2e7f6a23bf1f5abb1511f1bc624e6b94e00b1147c8996cbb16cb7a4adde6c5a65eba68b SHA512 f41eb9d3621681723276e569e3d663c9bcff4834127a4f6e346486814f1f4f49a6a5be8f14409ff9514798455f22766a1ed4dc8b6a6ea2d02f2ce8f5de53d6b5 EBUILD rocr-runtime-5.5.1.ebuild 1767 BLAKE2B d40d4db7f5d5609fc324944e64df866acdde567f5be2f85006ae0c1f56180e5c0c7e4ebcc87e884c5dd824111886b46a72a368eb66e7cb9c694e2d2398182d83 SHA512 c443449775b064e691aaa068903b8fd65e710e447fe88d2a33a7a22e5a2eca22fc1b18985ce8d7c20e49fc6c33fba7fe0fa7ec0ce884c0775f5c53963a12210c -EBUILD rocr-runtime-5.7.1-r1.ebuild 1859 BLAKE2B 06897559fc90982ab8ee3b239a8dabc4acff310043fa0a2d7bbdccf2bdc874bca9dda75c71a64b66f3035c085d4b7711c3ca38551173fdaea8692ab2d0779bb3 SHA512 46833d46b8f4aee9dd8c9be24ba6c8c0d1d31113eae9b4c4f0b26b81b43b8a0228cde2012bca5139e20bd577d28ff3483ea08e9a54b7c1da34dc633d807c9ef5 -EBUILD rocr-runtime-6.0.0.ebuild 1795 BLAKE2B 983418b479375cb5e260307945eb6b1f500a7dc4efb3e44bc990025d061e9ccf22041815db10d8e37c2a3a8c350b9d594778dba7784ef734cb06cd3ed19a44d6 SHA512 625d8490a0f0c23fe6868da2f8102f6a597277a78c4668056fe2b7c7d2106e8ff16b0f536aa3b358d0dff0f83a1b0afd516cb26615256ac5920fba11048d6d62 +EBUILD rocr-runtime-5.7.1-r2.ebuild 1933 BLAKE2B 5477718eea40fa0254a0fc4b281a3c32fc2962b1de0d835ae235a7278b5f07d66f13f1915f1c23a750906a0247902e854789607c62e58ccb7269def790ff2344 SHA512 fbc18eda78e7290b780c7b49ecfda78945782b293eeb08fed95f92289380c2f5912786defce12abac2de8c9704abdb453c7a96f601e79b99eff04c9f2a1ac293 +EBUILD rocr-runtime-6.0.0-r1.ebuild 1869 BLAKE2B 3c7ef21868a9ebddfda260ba433ee33738a8d961661f1e62fc0e6d4c2feda7a3ec338416148af37f5ed53eda8f53363068d6b4c81dd0e622bbb7551c1e6549ff SHA512 8db31035d8370eb953600edd728809abf383a086d713a3bbab960f2944692c3df9ed2a22806b4a5ba9ebab065c32b79ba35b53a1ef730df96ad8289c982d8968 MISC metadata.xml 515 BLAKE2B ccb566413bfb5e7027d1596b040f6c957dc8d58fc413859c4a08fbd484ab16d536948bcf24cdd1edd5bdc8a4951b5abe6adbb3da6fde37e5a9ba1bdcfd312827 SHA512 6d0f0ab69b8f04a9106d71003f17c00e693b42c03aa5c430ebb03f7ffb3ecb8f4b10128fd22462692b97870c23e85aa3f037433fa65c55a342d64038f0db5a93 diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch new file mode 100644 index 000000000000..0e8e53209738 --- /dev/null +++ b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch @@ -0,0 +1,106 @@ +Fix compilation with musl. + +Bug: https://github.com/ROCm/ROCR-Runtime/issues/181 +--- a/core/inc/checked.h ++++ b/core/inc/checked.h +@@ -58,7 +58,7 @@ template <uint64_t code, bool multiProcess = false> class Check final { + Check(const Check&) { object_ = uintptr_t(this) ^ uintptr_t(code); } + Check(Check&&) { object_ = uintptr_t(this) ^ uintptr_t(code); } + +- ~Check() { object_ = NULL; } ++ ~Check() { object_ = uintptr_t(NULL); } + + const Check& operator=(Check&& rhs) { return *this; } + const Check& operator=(const Check& rhs) { return *this; } +--- a/core/runtime/default_signal.cpp ++++ b/core/runtime/default_signal.cpp +@@ -57,7 +57,7 @@ int BusyWaitSignal::rtti_id_ = 0; + BusyWaitSignal::BusyWaitSignal(SharedSignal* abi_block, bool enableIPC) + : Signal(abi_block, enableIPC) { + signal_.kind = AMD_SIGNAL_KIND_USER; +- signal_.event_mailbox_ptr = NULL; ++ signal_.event_mailbox_ptr = uint64_t(NULL); + } + + hsa_signal_value_t BusyWaitSignal::LoadRelaxed() { +--- a/core/util/lnx/os_linux.cpp ++++ b/core/util/lnx/os_linux.cpp +@@ -111,9 +111,12 @@ class os_thread { + } + } + ++ int cores = 0; ++ cpu_set_t* cpuset = nullptr; ++ + if (core::Runtime::runtime_singleton_->flag().override_cpu_affinity()) { +- int cores = get_nprocs_conf(); +- cpu_set_t* cpuset = CPU_ALLOC(cores); ++ cores = get_nprocs_conf(); ++ cpuset = CPU_ALLOC(cores); + if (cpuset == nullptr) { + fprintf(stderr, "CPU_ALLOC failed: %s\n", strerror(errno)); + return; +@@ -122,12 +125,6 @@ class os_thread { + for (int i = 0; i < cores; i++) { + CPU_SET(i, cpuset); + } +- err = pthread_attr_setaffinity_np(&attrib, CPU_ALLOC_SIZE(cores), cpuset); +- CPU_FREE(cpuset); +- if (err != 0) { +- fprintf(stderr, "pthread_attr_setaffinity_np failed: %s\n", strerror(err)); +- return; +- } + } + + err = pthread_create(&thread, &attrib, ThreadTrampoline, args.get()); +@@ -157,6 +154,14 @@ class os_thread { + if (err != 0) { + fprintf(stderr, "pthread_attr_destroy failed: %s\n", strerror(err)); + } ++ ++ if (thread && cores && cpuset) { ++ err = pthread_setaffinity_np(thread, CPU_ALLOC_SIZE(cores), cpuset); ++ CPU_FREE(cpuset); ++ if (err != 0) { ++ fprintf(stderr, "pthread_setaffinity_np failed: %s\n", strerror(err)); ++ } ++ } + } + + os_thread(os_thread&& rhs) { +@@ -617,11 +622,13 @@ SharedMutex CreateSharedMutex() { + fprintf(stderr, "rw lock attribute init failed: %s\n", strerror(err)); + return nullptr; + } ++#if defined(__GLIBC__) + err = pthread_rwlockattr_setkind_np(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); + if (err != 0) { + fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err)); + return nullptr; + } ++#endif + + pthread_rwlock_t* lock = new pthread_rwlock_t; + err = pthread_rwlock_init(lock, &attrib); +--- a/core/util/utils.h ++++ b/core/util/utils.h +@@ -74,7 +74,7 @@ static __forceinline void* _aligned_malloc(size_t size, size_t alignment) { + return aligned_alloc(alignment, size); + #else + void *mem = NULL; +- if (NULL != posix_memalign(&mem, alignment, size)) ++ if (0 != posix_memalign(&mem, alignment, size)) + return NULL; + return mem; + #endif +--- a/image/util.h ++++ b/image/util.h +@@ -95,7 +95,7 @@ static __forceinline void* _aligned_malloc(size_t size, size_t alignment) { + return aligned_alloc(alignment, size); + #else + void* mem = NULL; +- if (NULL != posix_memalign(&mem, alignment, size)) return NULL; ++ if (0 != posix_memalign(&mem, alignment, size)) return NULL; + return mem; + #endif + } diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild index 564da67950fa..00615488c2d2 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r1.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild @@ -3,10 +3,10 @@ EAPI=8 -inherit cmake flag-o-matic llvm - LLVM_MAX_SLOT=17 +inherit cmake flag-o-matic llvm + if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/" inherit git-r3 @@ -22,6 +22,7 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" PATCHES=( "${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch" "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch" + "${FILESDIR}/${PN}-5.7.1-musl.patch" ) LICENSE="MIT" @@ -33,8 +34,8 @@ COMMON_DEPEND="dev-libs/elfutils DEPEND="${COMMON_DEPEND} >=dev-libs/roct-thunk-interface-${PV} >=dev-libs/rocm-device-libs-${PV} - sys-devel/clang - sys-devel/lld" + sys-devel/clang:${LLVM_MAX_SLOT}= + sys-devel/lld:${LLVM_MAX_SLOT}=" RDEPEND="${DEPEND}" BDEPEND="app-editors/vim-core" # vim-core is needed for "xxd" diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild index 840a1949b160..cdd27fbbbefd 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-6.0.0.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,6 +21,7 @@ DESCRIPTION="Radeon Open Compute Runtime" HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" PATCHES=( "${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch" + "${FILESDIR}/${PN}-5.7.1-musl.patch" ) LICENSE="MIT" @@ -32,8 +33,8 @@ COMMON_DEPEND="dev-libs/elfutils DEPEND="${COMMON_DEPEND} >=dev-libs/roct-thunk-interface-${PV} >=dev-libs/rocm-device-libs-${PV} - sys-devel/clang - sys-devel/lld" + sys-devel/clang:${LLVM_MAX_SLOT}= + sys-devel/lld:${LLVM_MAX_SLOT}=" RDEPEND="${DEPEND}" BDEPEND="app-editors/vim-core" # vim-core is needed for "xxd" diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest index f2268c47f4de..644cf92014b1 100644 --- a/dev-libs/roct-thunk-interface/Manifest +++ b/dev-libs/roct-thunk-interface/Manifest @@ -1,4 +1,5 @@ AUX roct-thunk-interface-5.7.0-functions.patch 335 BLAKE2B 590ee1b8f412836c9fae0e10d7acd91842f6dd9aa87dd40a7a8ea48596dc2a1aabf2dea69cc2924fa0b4467d8238bde42c58ac95415fc0324133ea4389f413a8 SHA512 a1961fb2d0636bdb1720abdf433ef4d0f5f69f48784efc45ed77dc8cdd7bc2433dc9aaec0ef9105db12e4d6a8a57d50ee1ffa7b0d42990be1d88ff668f7b15ba +AUX roct-thunk-interface-5.7.1-musl.patch 1878 BLAKE2B c2103b5b8d76e3a637b79bb701308d7c1b2f6def76206e5a1e3841c12e92bec19a6e9a596238709ee4413072530dd984f7910be6bfc394622b34a93ad5cf1c9e SHA512 b5da199e15eb01a087bbc3600a7df5971029594a778ebfc71185320a662f0681a65fd55ad71ba3089e6a72745dfa1de5f637cb96fe8ab3510869e9fb272f5819 AUX roct-thunk-interface-6.0.0-functions.patch 309 BLAKE2B 98644ddc99416d99da0c671e4b70607cb360831fd0f2a64f38e6f2f2c008d9c6b2fa24a1ac525cbbbdffabf918eaf84ce0c10db7a383e05ac30f6e999c6913f4 SHA512 136b42cac9dfb209594b6b88c4abd501e98d48dca1bd573443e414ab7098cfcac3789cecb3b625e8ed91d0d15fe1ef13668bf4da9f89d808838de9d348eba99f DIST roct-thunk-interface-5.1.3.tar.gz 3178689 BLAKE2B c46af7bc60772beaa9a214a86a634290cfd7952589f70736c0c2544c0459eb4fdcc65030d897dbb67bfbaae545f529ac647397df3fcfeddeb5d5e05a283cfd6b SHA512 746a04e667ce242160d6e2519594fc93b205520dae28678859fbd40c3c641082aa6219c04c8e2b58289763a5244dd6336b56c2e2016ba671c5e5a6fb9ca5caea DIST roct-thunk-interface-5.3.3.tar.gz 646773 BLAKE2B 48632cad576ceccede0ee62663f226cbedba8374d8962028fd729a7b8e7eb75bebcb2f8ce06a838de15a388caea3d6dcb150db80f8d45a91675997b4f80625e6 SHA512 4a8730d16a0d240a43d5e22092325b0731d133733af0aac6c6893763d1ffb1a04a0c045d988835079581e097fc7c9e383f41ba84daa105c032d3a653b6b2c6b0 @@ -10,6 +11,6 @@ EBUILD roct-thunk-interface-5.1.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628ca EBUILD roct-thunk-interface-5.3.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f EBUILD roct-thunk-interface-5.4.3.ebuild 1107 BLAKE2B c5523fd9ba5475faf5b8bb4ea35a100f4049a8b008c3dec048e03b8e14b394f28b8b5515f7b93c94774c75304e2df7ef745e9538eae5309c6faa569748d32551 SHA512 dfc0e032b61667c9171900f36bc7f18df0e67635e8988d91a8041c298053d9c977adf123af2326e7986bbe00f45ea3ec3e3630ff0993279cfd7becbb5492fc36 EBUILD roct-thunk-interface-5.5.1.ebuild 1107 BLAKE2B c5523fd9ba5475faf5b8bb4ea35a100f4049a8b008c3dec048e03b8e14b394f28b8b5515f7b93c94774c75304e2df7ef745e9538eae5309c6faa569748d32551 SHA512 dfc0e032b61667c9171900f36bc7f18df0e67635e8988d91a8041c298053d9c977adf123af2326e7986bbe00f45ea3ec3e3630ff0993279cfd7becbb5492fc36 -EBUILD roct-thunk-interface-5.7.1.ebuild 1162 BLAKE2B 005cd43b3e27666b19ccddc5269f0e31c79a41d476a0271ce8ee8d4f56931b2e29575781dcae35f7a3bdc277e802352ef23e08f0a173bf25947239c180e9d393 SHA512 6185e2552807d4ac4241f3b6a150e8d2167df395bc56516347e1c6ea4d7244d89b5fef7e6f34ae9bee3017fd8cd899133c0d96f4d413c6d9173bf329eadffdee -EBUILD roct-thunk-interface-6.0.0.ebuild 1162 BLAKE2B 0cf0fd4fc62e7f261c8a8c4670ca4772bae1266d5d54f03df793ee590759d017cf545911ad926e7a4bf54756bcee6248e53a5c0d2dab88e0639fae1c92734bcb SHA512 487d51b986181ef04d1e007546afb936b6dea78acf3a46a3fb77f001b9d12982941bf74935c5cad4f2db7a344db64cdafebf40ae77dbc5bdf3c2037052a14fb8 +EBUILD roct-thunk-interface-5.7.1-r1.ebuild 1201 BLAKE2B 6170ec14b2be3b309b7a95a0103341d55de32c2ef634a3cf84b31370b6675438978adb87eb71ca6e0e886b4ae7f87c5c8898509fdcd4a1d374ef9f91d258af08 SHA512 babbe1248eba4206f81db3a99e983eae1d540691e36a0f1595a9ce17398aea7fa9c15ec564dbb0abf48e2e58ec47155f62ca77af80afd07ce16ede394c489097 +EBUILD roct-thunk-interface-6.0.0-r1.ebuild 1201 BLAKE2B 97007918218c6b07e9cf7b077250e32694c068618cabf8f5dc672a66e35b6e1480ee6ebda1c67c5576a5f0005be52d828d8c6ab02116be98997606bc47b6878a SHA512 676cdd9fadff9c74568d1b841c2819d483089d4ed82aa9ce0cde55b61ca7ab8ea164b6ef6ac27655e38697ae5361357b18d430dbf53687c3ffecf0484db61867 MISC metadata.xml 674 BLAKE2B ceb6cc04ddd9f957a765c89bfe83de382412c5d04bce87e3fa9c0fdfe72fa2d24e597aa47287488463fa34d85a91556d2b7ea073b19c341a48045c9e7f51f9f3 SHA512 8cb0feb4d6ea9d3de4a45a9be0de498b5ebb36a779af03e58f5c04593082e5bd618614c1daf2707f3bb1de019bf88292605669e2be48d9bede6e708c39aae7e2 diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.1-musl.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.1-musl.patch new file mode 100644 index 000000000000..8cd8a5ff2ee1 --- /dev/null +++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-5.7.1-musl.patch @@ -0,0 +1,61 @@ +Upstream PR: https://github.com/ROCm/ROCT-Thunk-Interface/pull/96 +Bug: https://github.com/ROCm/ROCT-Thunk-Interface/issues/65 +--- a/src/globals.c ++++ b/src/globals.c +@@ -32,5 +32,9 @@ unsigned long kfd_open_count; + unsigned long system_properties_count; + pthread_mutex_t hsakmt_mutex = PTHREAD_MUTEX_INITIALIZER; + bool is_dgpu; ++ ++#ifndef PAGE_SIZE + int PAGE_SIZE; ++#endif ++ + int PAGE_SHIFT; +--- a/src/libhsakmt.h ++++ b/src/libhsakmt.h +@@ -62,7 +62,11 @@ extern HsaVersionInfo kfd_version_info; + do { if ((minor) > kfd_version_info.KernelInterfaceMinorVersion)\ + return HSAKMT_STATUS_NOT_SUPPORTED; } while (0) + ++/* Might be defined in limits.h on platforms where it is constant (used by musl) */ ++/* See also: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html */ ++#ifndef PAGE_SIZE + extern int PAGE_SIZE; ++#endif + extern int PAGE_SHIFT; + + /* VI HW bug requires this virtual address alignment */ +--- a/src/openclose.c ++++ b/src/openclose.c +@@ -116,7 +116,9 @@ static void clear_after_fork(void) + + static inline void init_page_size(void) + { ++#ifndef PAGE_SIZE + PAGE_SIZE = sysconf(_SC_PAGESIZE); ++#endif + PAGE_SHIFT = ffs(PAGE_SIZE) - 1; + } + +--- a/src/topology.c ++++ b/src/topology.c +@@ -32,6 +32,7 @@ + #include <string.h> + #include <unistd.h> + #include <ctype.h> ++#include <limits.h> + + #include <errno.h> + #include <sys/sysinfo.h> +@@ -1369,6 +1370,10 @@ static int topology_create_temp_cpu_cache_list(int node, + * which can be present twice in the string above. 29 is for the prefix + * and the +6 is for the cache suffix + */ ++#ifndef MAXNAMLEN ++/* MAXNAMLEN is the BSD name for NAME_MAX. glibc aliases this as NAME_MAX, but not musl */ ++#define MAXNAMLEN NAME_MAX ++#endif + const uint32_t MAXPATHSIZE = 29 + MAXNAMLEN + (MAXNAMLEN + 6); + cpu_cacheinfo_t *p_temp_cpu_ci_list; /* a list of cpu_ci */ + char path[MAXPATHSIZE], node_dir[MAXPATHSIZE]; diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.7.1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.7.1-r1.ebuild index 2b6233891f0f..86cd350d7e3d 100644 --- a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.7.1.ebuild +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,10 @@ BDEPEND="x11-libs/libdrm[video_cards_amdgpu]" CMAKE_BUILD_TYPE=Release -PATCHES=( "${FILESDIR}/${PN}-5.7.0-functions.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.7.0-functions.patch" + "${FILESDIR}/${PN}-5.7.1-musl.patch" +) src_prepare() { sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0-r1.ebuild index 353f0030f362..83c87c70b2d3 100644 --- a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0.ebuild +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,10 @@ BDEPEND="x11-libs/libdrm[video_cards_amdgpu]" CMAKE_BUILD_TYPE=Release -PATCHES=( "${FILESDIR}/${PN}-6.0.0-functions.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-6.0.0-functions.patch" + "${FILESDIR}/${PN}-5.7.1-musl.patch" +) src_prepare() { sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die |