From ca144cbf71b2faf598564847378fa40a0090d67c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Oct 2022 19:51:12 +0100 Subject: gentoo auto-resync : 15:10:2022 - 19:51:12 --- dev-libs/Manifest.gz | Bin 95929 -> 95931 bytes dev-libs/rocm-comgr/Manifest | 2 +- dev-libs/rocm-comgr/rocm-comgr-5.1.3-r1.ebuild | 57 +++++++++++++++++++++++++ dev-libs/rocm-comgr/rocm-comgr-5.1.3.ebuild | 57 ------------------------- dev-libs/yajl/Manifest | 2 +- dev-libs/yajl/yajl-2.1.0-r3.ebuild | 4 +- 6 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 dev-libs/rocm-comgr/rocm-comgr-5.1.3-r1.ebuild delete mode 100644 dev-libs/rocm-comgr/rocm-comgr-5.1.3.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 0e86dfadd729..e76b56308afe 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index 2ed565ba7248..fdf3119fc3fa 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -25,5 +25,5 @@ EBUILD rocm-comgr-4.3.0-r1.ebuild 1291 BLAKE2B 841c0cc81d46ab8180a572de5ab911cac EBUILD rocm-comgr-4.3.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6 EBUILD rocm-comgr-4.5.2.ebuild 1097 BLAKE2B 2a8ec9f20371b7c86295dea6a044da83c96a0774c55f774b4b01118fb3c27185beb7b09a94144b43d95e75eed3ac2fae780314244ec7e2f55b7b3f82303a8969 SHA512 7fc5a888c252736f1777580208d6f2701a8b52690ce1753a10f259e5534d0027e09161a12b7d8bb9717c921fd0b1d31a89fda787ce9fb1f605d78d9ab5af2a07 EBUILD rocm-comgr-5.0.2.ebuild 1633 BLAKE2B e0d150a3926662b7347a57994cadd835c8083215c56536b1eaae3d1fca13b601a59528da12c600c44edbe9ae78918fdc5ee2f32224a59293a30df9e7603e7d7d SHA512 7ae43bbbcf647d5a8c781b7ed0df41e34b7847776bfc4258f4bda4dace11512ddfee18f48c99cbc47124c7e6ad7984d332dee56edc3ac5688c3857408bd1c92f -EBUILD rocm-comgr-5.1.3.ebuild 1881 BLAKE2B ab58a7c0b4ed1614050f6512fcc78d68808d4a4021536d1abdc1bdac8cd556458e58c08a5474ebc5ec14a37ee14720fc4ce35dfd833da5d93fdb53e7e8cddc99 SHA512 fdadec621540301b320d4a4a63d035c8c9e1a69d56c6be01d1c582a4348f895626c40e46802c4b68cf0163c987cfb2372c8d87e01b8021916aa5e1e30845cbae +EBUILD rocm-comgr-5.1.3-r1.ebuild 1899 BLAKE2B 5795f1dafc7988ba33934c0d31c9cec2e0fdbf3ca611248f165a1cef893ca08a163b2bfe5f18d31f8212aaa4d6e7ebc8f84da367dab673b9615606dded13306c SHA512 ff77d4685c6d91c079711b2575fcb9fd4aa49ffa6f9a96bdc3e44b771ae6776fa97946699dd9752792f6e563c40f1344429e4332453e642ad16730db9cac9ce9 MISC metadata.xml 382 BLAKE2B c49984c9ac37bdd2ba8f4345d91d4b6e79f4e8d91e0b89dcd286ef32ede9477c964554cafe52419ca1d696a4b2b7391d45c6a8a4316e3a3103268153fc3bdda2 SHA512 d8d0ce6840a73611e02721c1fd458f9756962583484a61c6fe9051dcca1641091008eea4c01a71d4ee70649eb4c29e99d86e1f24861c05e4a542d0c60d388590 diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r1.ebuild new file mode 100644 index 000000000000..0674badac939 --- /dev/null +++ b/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake llvm prefix + +LLVM_MAX_SLOT=14 + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/" + inherit git-r3 + S="${WORKDIR}/${P}/lib/comgr" +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" + KEYWORDS="~amd64" +fi + +PATCHES=( + "${FILESDIR}/${PN}-4.5.2-dependencies.patch" + "${FILESDIR}/${PN}-5.1.3-Find-CLANG_RESOURCE_DIR.patch" + "${FILESDIR}/${PN}-5.1.3-clang-link.patch" + "${FILESDIR}/${PN}-5.1.3-clang-fix-include.patch" + "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" + "${FILESDIR}/0001-COMGR-changes-needed-for-upstream-llvm.patch" +) + +DESCRIPTION="Radeon Open Compute Code Object Manager" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND=">=dev-libs/rocm-device-libs-${PV} + sys-devel/clang:${LLVM_MAX_SLOT}= + sys-devel/clang-runtime:= + sys-devel/lld:${LLVM_MAX_SLOT}=" +DEPEND="${RDEPEND}" + +CMAKE_BUILD_TYPE=Release + +src_prepare() { + sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die + sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die + sed '/Args.push_back(HIPIncludePath/,+1d' -i src/comgr-compiler.cpp || die + sed '/Args.push_back(ROCMIncludePath/,+1d' -i src/comgr-compiler.cpp || die # ROCM and HIPIncludePath is now /usr, which disturb the include order + eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 + ) + cmake_src_configure +} diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.1.3.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.1.3.ebuild deleted file mode 100644 index 8f03fe89a883..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.1.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=14 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/" - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi - -PATCHES=( - "${FILESDIR}/${PN}-4.5.2-dependencies.patch" - "${FILESDIR}/${PN}-5.1.3-Find-CLANG_RESOURCE_DIR.patch" - "${FILESDIR}/${PN}-5.1.3-clang-link.patch" - "${FILESDIR}/${PN}-5.1.3-clang-fix-include.patch" - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-COMGR-changes-needed-for-upstream-llvm.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - sys-devel/clang:${LLVM_MAX_SLOT}= - sys-devel/clang-runtime:= - sys-devel/lld" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - sed '/Args.push_back(HIPIncludePath/,+1d' -i src/comgr-compiler.cpp || die - sed '/Args.push_back(ROCMIncludePath/,+1d' -i src/comgr-compiler.cpp || die # ROCM and HIPIncludePath is now /usr, which disturb the include order - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - ) - cmake_src_configure -} diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest index c6b2e6c8ccc6..cdf4b74ab92a 100644 --- a/dev-libs/yajl/Manifest +++ b/dev-libs/yajl/Manifest @@ -1,5 +1,5 @@ AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985 -EBUILD yajl-2.1.0-r3.ebuild 945 BLAKE2B 5ed4bc99146751902de9d2bdc6b8349707c0215329328516440ce121cd45816d301a8c7b609b287a7d509a1bea27afab99544e705e31f72f9ae30588a01b3b97 SHA512 0b1be66e59c93c90e59d3057a01fd39a3fd8f31659bbe0c8c6374d9ce8f4773e5d57847a405e58fb4125a2b530e34dfe69be0245d00111caff1093fd1123bf87 +EBUILD yajl-2.1.0-r3.ebuild 951 BLAKE2B 5d9180d5a282cd5b9ad599d93f4472d54734fcc39d249b4d834e36b572dc0af4c3110815baeb3ac7d2b44b24955dd1d6dc653da0d66e21cdd19435eaff58c64e SHA512 2c06b6512bfef9ddcf7a245836f30f7fc48484c108de96ba932a993730ed0e68d7ba4cc2f05c6a8457860318e4b5d354a70285b017c2a6723b06522a7b8d4314 MISC metadata.xml 337 BLAKE2B 11442725a3ce669685b6c6d2c5ea5c2b4299171f457c7e897e66199de5e46a3434e4b57ed7dba37e3fdf36f2957eb6a67ec0e4805f03f030a05552e688d039bb SHA512 8f91fa500eba8067bd756f42cce81a5473d2c85f5d46a8593bd391c8c39b6b4d548dcce5a4b1e5f92adf1b3b9ba728bc590bff9ba5961a524afb1c592c6c2d16 diff --git a/dev-libs/yajl/yajl-2.1.0-r3.ebuild b/dev-libs/yajl/yajl-2.1.0-r3.ebuild index bb1ce204cc88..ff3f652ee643 100644 --- a/dev-libs/yajl/yajl-2.1.0-r3.ebuild +++ b/dev-libs/yajl/yajl-2.1.0-r3.ebuild @@ -6,8 +6,8 @@ EAPI=7 inherit cmake-multilib DESCRIPTION="Small event-driven (SAX-style) JSON parser" -HOMEPAGE="https://lloyd.github.com/yajl/" -SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" +HOMEPAGE="https://lloyd.github.com/yajl" +SRC_URI="https://github.com/lloyd/yajl/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/lloyd-yajl-66cb08c" LICENSE="ISC" -- cgit v1.2.3