summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2024-08-20 02:07:52 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2024-08-20 02:07:52 +0000
commitc6e1e46af972319ef054d7c3d80b2e1b937f5fda (patch)
tree9059fb877157c8c0a06b3ee4f944d114487c542a
parent2024-08-20 01:49:01 UTC (diff)
parentdev-debug/dtrace: update F_S comment in non-live (diff)
downloadgentoo-c6e1e46af972319ef054d7c3d80b2e1b937f5fda.tar.gz
gentoo-c6e1e46af972319ef054d7c3d80b2e1b937f5fda.tar.bz2
gentoo-c6e1e46af972319ef054d7c3d80b2e1b937f5fda.zip
Merge updates from master
-rw-r--r--dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild10
-rw-r--r--dev-debug/dtrace/dtrace-9999.ebuild8
2 files changed, 17 insertions, 1 deletions
diff --git a/dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild b/dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild
index 4a48a07e8545..f084535e5911 100644
--- a/dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild
+++ b/dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild
@@ -69,6 +69,13 @@ BDEPEND="
# https://github.com/oracle/dtrace-utils/issues/80
DEPEND+=" dev-debug/valgrind"
+QA_PRESTRIPPED="
+ usr/.*/dtrace/testsuite/test/triggers/.*
+"
+QA_FLAGS_IGNORED="
+ usr/.*/dtrace/testsuite/test/triggers/.*
+"
+
pkg_pretend() {
# TODO: optional kernel patches
@@ -79,6 +86,7 @@ pkg_pretend() {
# Tracing
CONFIG_CHECK+=" ~FTRACE_SYSCALLS ~UPROBE_EVENTS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
+ CONFIG_CHECK+=" ~FPROBE"
# https://gcc.gnu.org/PR84052
CONFIG_CHECK+=" !GCC_PLUGIN_RANDSTRUCT"
@@ -97,7 +105,7 @@ src_configure() {
tc-export CC
- # TODO: Can drop once https://lore.kernel.org/dtrace/20240425164057.420580-1-nick.alcock@oracle.com/ is in
+ # https://github.com/oracle/dtrace-utils/issues/78
tc-enables-fortify-source && append-cppflags -U_FORTIFY_SOURCE
# lld does this by default, so fix that, although lld fails anyway...
diff --git a/dev-debug/dtrace/dtrace-9999.ebuild b/dev-debug/dtrace/dtrace-9999.ebuild
index 40c98e7440cd..f084535e5911 100644
--- a/dev-debug/dtrace/dtrace-9999.ebuild
+++ b/dev-debug/dtrace/dtrace-9999.ebuild
@@ -69,6 +69,13 @@ BDEPEND="
# https://github.com/oracle/dtrace-utils/issues/80
DEPEND+=" dev-debug/valgrind"
+QA_PRESTRIPPED="
+ usr/.*/dtrace/testsuite/test/triggers/.*
+"
+QA_FLAGS_IGNORED="
+ usr/.*/dtrace/testsuite/test/triggers/.*
+"
+
pkg_pretend() {
# TODO: optional kernel patches
@@ -79,6 +86,7 @@ pkg_pretend() {
# Tracing
CONFIG_CHECK+=" ~FTRACE_SYSCALLS ~UPROBE_EVENTS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
+ CONFIG_CHECK+=" ~FPROBE"
# https://gcc.gnu.org/PR84052
CONFIG_CHECK+=" !GCC_PLUGIN_RANDSTRUCT"