commit: 46633e43616f59179b7c0aa61d9feef83e903c31 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Thu Aug 21 12:28:49 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Thu Aug 21 12:29:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46633e43
dev-libs/dynolog: add 0.2.2, drop 0.3.1_p20230126-r6 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-libs/dynolog/Manifest | 3 +- ....1_p20230126-r6.ebuild => dynolog-0.2.2.ebuild} | 37 ++++++++++------------ .../files/dynolog-0.3.1_p20230126-gcc15.patch | 10 ------ .../files/dynolog-0.3.1_p20230126-noWerror.patch | 11 ------- dev-libs/dynolog/metadata.xml | 3 ++ 5 files changed, 22 insertions(+), 42 deletions(-) diff --git a/dev-libs/dynolog/Manifest b/dev-libs/dynolog/Manifest index 72dc2c7eca05..97b75c4e8422 100644 --- a/dev-libs/dynolog/Manifest +++ b/dev-libs/dynolog/Manifest @@ -5,7 +5,8 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea DIST clap_derive-3.2.25.crate 28212 BLAKE2B 8782f6425ed46197c5e5293e2f06fd82b2d17ea3e89206580ef3c6853bed2e8c99ef2528a30276a8287215d7f5505a992dd43c59f26b2915757c8e2f20510843 SHA512 c98098bfedb8b681d72eaedb946d9867fd068d9be31137fe1fb5d821cd68afec48e7d2963adb2099aa760c702d5b75fb0ed45fc62b83d7f26edc8cecc03ea5d3 DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f -DIST dynolog-0.3.1_p20230126.tar.gz 18445927 BLAKE2B 6885bfde54d07a6783a7007f3ee1615b25fb79da0a32e68e11c93165807125e09614f01c6559787383b50e9bd0c11893071f6464de378517bfd7239dca54ab81 SHA512 38edb2fab5c4e6b64ee3fda557cdf610d383a3054db7a47ac4844d45104641098c81a27a82f20a0d2b60da2799902df5be8ac2967155ca72e3e1e1df75e30821 +DIST dynolog-0.2.2.tar.gz 1692663 BLAKE2B 2ee03874b9f86209f2fb1dbcc127358fdbfd17ad8da2ffb28593b70e591e4938e7e3c76afff0e27ff1227c4dd64a0cb667b143e3b2a8ab4a3de2c6a85becd0fc SHA512 fbc7a13194bf712afe557302eddedd6b9a7d71853a444845c380683eb37dff114ec9c727be442c4c26b359ebc861f3bbf7ece6861c24357b6b65cef0b3e035f9 +DIST dynolog-0.2.2_dcgm.tar.gz 7454762 BLAKE2B 2dcf7af3931ac7924a6f8fbd95d2bd5f0ad1278f22cd402188c4afb56b01548871beb451dc54fad49539b4c9dd1bac3c12ffb799bf7947a26fd00fcf2bfef019 SHA512 eed862d96c33eb2b08f312c65e1febc76a6a0f6351fd6f87c236ae4a08729975b3ad529f8cfede338b483453015800b4774f5ddba062dd00646c656335fc3365 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r6.ebuild b/dev-libs/dynolog/dynolog-0.2.2.ebuild similarity index 74% rename from dev-libs/dynolog/dynolog-0.3.1_p20230126-r6.ebuild rename to dev-libs/dynolog/dynolog-0.2.2.ebuild index 29291a7504f0..d2573bb50af3 100644 --- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r6.ebuild +++ b/dev-libs/dynolog/dynolog-0.2.2.ebuild @@ -44,15 +44,20 @@ CRATES=" inherit cargo cmake dot-a +DcgmCommitId=ffde4e54bc7249a6039a5e6b45b395141e1217f9 + DESCRIPTION="Performance monitoring daemon for heterogeneous CPU-GPU systems" HOMEPAGE="https://github.com/facebookincubator/dynolog"; -SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${P}.tar.gz +SRC_URI="https://github.com/facebookincubator/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/NVIDIA/DCGM/archive/${DcgmCommitId}.tar.gz + -> ${P}_dcgm.tar.gz ${CARGO_CRATE_URIS}" LICENSE="BSD Apache-2.0 Boost-1.0 MIT Unicode-DFS-2016 Unlicense" SLOT="0" KEYWORDS="~amd64 ~arm64" -IUSE="test" +IUSE="perf-events test" RESTRICT="!test? ( test )" DEPEND="dev-cpp/gflags @@ -68,26 +73,19 @@ RDEPEND="${DEPEND}" QA_FLAGS_IGNORED=/usr/bin/dyno PATCHES=( - "${FILESDIR}"/${P}-gcc13.patch - "${FILESDIR}"/${P}-unbundling.patch - "${FILESDIR}"/${P}-noWerror.patch - "${FILESDIR}"/${P}-riscv.patch - "${FILESDIR}"/${P}-musl.patch - "${FILESDIR}"/${P}-libcxx.patch - "${FILESDIR}"/${P}-gcc15.patch - "${FILESDIR}"/${P}-nofmt.patch - "${FILESDIR}"/${P}-nojson.patch + "${FILESDIR}"/${PN}-0.3.1_p20230126-gcc13.patch + "${FILESDIR}"/${PN}-0.3.1_p20230126-unbundling.patch + "${FILESDIR}"/${PN}-0.3.1_p20230126-riscv.patch + "${FILESDIR}"/${PN}-0.3.1_p20230126-musl.patch + "${FILESDIR}"/${PN}-0.3.1_p20230126-libcxx.patch + "${FILESDIR}"/${PN}-0.3.1_p20230126-nofmt.patch + "${FILESDIR}"/${PN}-0.3.1_p20230126-nojson.patch ) CMAKE_SKIP_TESTS=( "Defs.CpuSet" "KernelCollecterTest.NetworkStatsTest" ) src_prepare() { - rm -r third_party/fmt || die - rm -r third_party/gflags || die - rm -r third_party/glog || die - rm -r third_party/googletest || die - rm -r third_party/json || die - rm -r third_party/pfs || die + mv "${WORKDIR}"/DCGM-${DcgmCommitId}/* third_party/DCGM/ || die sed -i \ -e "s:__u64:ino_t:g" \ hbt/src/common/System.h \ @@ -104,8 +102,8 @@ src_configure() { lto-guarantee-fat local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF - -DCPR_FORCE_USE_SYSTEM_CURL=ON -DBUILD_TESTS=$(usex test) + -DUSE_JSON_GENERATED_PERF_EVENTS=$(usex perf-events) ) cmake_src_configure cd cli @@ -119,12 +117,11 @@ src_compile() { } src_install() { - cmake_src_install mkdir -p headers/dynolog/src/ipcfabric cp dynolog/src/ipcfabric/FabricManager.h \ headers/dynolog/src/ipcfabric || die doheader -r dynolog - cd ../cli + einstalldocs cd cli cargo_src_install strip-lto-bytecode diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-gcc15.patch b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-gcc15.patch deleted file mode 100644 index f3e55f56f2d7..000000000000 --- a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-gcc15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/third_party/cpr/include/cpr/callback.h 2024-09-18 22:01:50.107007518 +0200 -+++ b/third_party/cpr/include/cpr/callback.h 2024-09-18 22:03:21.582963325 +0200 -@@ -4,6 +4,7 @@ - #include "cprtypes.h" - - #include <functional> -+#include <cstdint> - #include <utility> - - namespace cpr { diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-noWerror.patch b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-noWerror.patch deleted file mode 100644 index 3d334ce96d5f..000000000000 --- a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-noWerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/third_party/cpr/CMakeLists.txt 2023-12-06 09:59:09.062148849 +0100 -+++ b/third_party/cpr/CMakeLists.txt 2023-12-06 09:59:27.615514631 +0100 -@@ -73,7 +73,7 @@ - - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - else() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Werror") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic") - endif() - - # SSL diff --git a/dev-libs/dynolog/metadata.xml b/dev-libs/dynolog/metadata.xml index 1afdcf76a673..1a0a0a9e65ad 100644 --- a/dev-libs/dynolog/metadata.xml +++ b/dev-libs/dynolog/metadata.xml @@ -5,6 +5,9 @@ <email>[email protected]</email> <name>Alfredo Tupone</name> </maintainer> + <use> + <flag name="perf-events">Add performance events</flag> + </use> <upstream> <remote-id type="github">facebookincubator/dynolog</remote-id> </upstream>
