* [gentoo-commits] repo/gentoo:master commit in: dev-libs/dynolog/, dev-libs/dynolog/files/
@ 2024-01-23 19:49 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2024-01-23 19:49 UTC (permalink / raw
To: gentoo-commits
commit: e0312de38c6fe743ecae9ed06c6309c9bf047dff
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 19:48:25 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 19:49:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0312de3
dev-libs/dynolog: build on riscv
Closes: https://bugs.gentoo.org/922515
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild | 1 +
.../dynolog/files/dynolog-0.3.1_p20230126-riscv.patch | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
index 501e5dee74d8..b1c6480f24db 100644
--- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
+++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc13.patch
"${FILESDIR}"/${P}-unbundling.patch
"${FILESDIR}"/${P}-noWerror.patch
+ "${FILESDIR}"/${P}-riscv.patch
)
CMAKE_SKIP_TESTS=( "Defs.CpuSet" )
diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-riscv.patch b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-riscv.patch
new file mode 100644
index 000000000000..7038dbfe7b12
--- /dev/null
+++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-riscv.patch
@@ -0,0 +1,18 @@
+diff -Naur a/hbt/src/common/System.h b/hbt/src/common/System.h
+--- a/hbt/src/common/System.h 2024-01-21 15:26:26.940486370 +0000
++++ b/hbt/src/common/System.h 2024-01-21 22:22:36.713134358 +0000
+@@ -445,6 +445,14 @@
+ asm volatile("mrs %0, cntvct_el0" : "=r"(tstamp));
+ cpu = getCpu();
+ return tstamp;
++#elif defined(__riscv)
++inline TimeStamp rdtscp(CpuId& cpu) {
++ TimeStamp tstamp;
++ // Use the RDCYCLE instruction for RISC-V.
++ asm volatile("rdcycle %0" : "=r"(tstamp));
++ cpu = getCpu();
++ return tstamp;
++
+ }
+ #endif
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/dynolog/, dev-libs/dynolog/files/
@ 2024-02-25 21:32 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2024-02-25 21:32 UTC (permalink / raw
To: gentoo-commits
commit: c622b082e9aaef6d827d0743951f5117731e1188
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 21:31:54 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 21:32:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c622b082
dev-libs/dynolog: fix pid_t not found
Closes: https://bugs.gentoo.org/922755
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild | 1 +
.../files/dynolog-0.3.1_p20230126-musl.patch | 25 ++++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
index b1c6480f24db..929a6ab56a8d 100644
--- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
+++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r1.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
"${FILESDIR}"/${P}-unbundling.patch
"${FILESDIR}"/${P}-noWerror.patch
"${FILESDIR}"/${P}-riscv.patch
+ "${FILESDIR}"/${P}-musl.patch
)
CMAKE_SKIP_TESTS=( "Defs.CpuSet" )
diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-musl.patch b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-musl.patch
new file mode 100644
index 000000000000..3890e68c4585
--- /dev/null
+++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-musl.patch
@@ -0,0 +1,25 @@
+diff --git a/dynolog/src/gpumon/Utils.h b/dynolog/src/gpumon/Utils.h
+index 0728cdc..844076d 100644
+--- a/dynolog/src/gpumon/Utils.h
++++ b/dynolog/src/gpumon/Utils.h
+@@ -1,19 +1,20 @@
+ // (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+ #pragma once
+
++#include <unistd.h>
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
+
+ namespace dynolog {
+
+ // Assume at most one pid running on each gpu device_id
+ // Result[i] is the pid running on device_id i,
+ // or -1 if no process is running
+ std::vector<pid_t> getPidsOnGpu();
+ // Input map is type <environment variable name, metadata name>
+ // output map is type <metadata name, metadata value>
+ std::unordered_map<std::string, std::string> getMetadataForPid(
+ pid_t pid,
+ const std::unordered_map<std::string, std::string>& keysMap);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/dynolog/, dev-libs/dynolog/files/
@ 2024-09-18 20:17 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2024-09-18 20:17 UTC (permalink / raw
To: gentoo-commits
commit: b8e455b33e095bb7e43bc4c090227361e0c9233e
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 20:14:02 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 20:17:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e455b3
dev-libs/dynolog: gcc15
Closes: https://bugs.gentoo.org/937537
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild | 1 +
dev-libs/dynolog/files/dynolog-0.3.1_p20230126-gcc15.patch | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
index 0df5a58659f9..ca74802f6de0 100644
--- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
+++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
"${FILESDIR}"/${P}-riscv.patch
"${FILESDIR}"/${P}-musl.patch
"${FILESDIR}"/${P}-libcxx.patch
+ "${FILESDIR}"/${P}-gcc15.patch
)
CMAKE_SKIP_TESTS=( "Defs.CpuSet" "KernelCollecterTest.NetworkStatsTest" )
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
new file mode 100644
index 000000000000..f3e55f56f2d7
--- /dev/null
+++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-gcc15.patch
@@ -0,0 +1,10 @@
+--- 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 {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-18 20:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-23 19:49 [gentoo-commits] repo/gentoo:master commit in: dev-libs/dynolog/, dev-libs/dynolog/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2024-02-25 21:32 Alfredo Tupone
2024-09-18 20:17 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox