Skip to content

Commit df7ae8b

Browse files
theunifanquake
authored andcommitted
depends: systemtap: remove variadic params that trigger compiler warnings
1 parent a66d82e commit df7ae8b

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

depends/packages/systemtap.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ $(package)_version=4.8
33
$(package)_download_path=https://sourceware.org/ftp/systemtap/releases/
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
55
$(package)_sha256_hash=cbd50a4eba5b261394dc454c12448ddec73e55e6742fda7f508f9fbc1331c223
6-
$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
6+
$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch fix_variadic_warning.patch
77

88
define $(package)_preprocess_cmds
99
patch -p1 < $($(package)_patch_dir)/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch && \
10+
patch -p1 < $($(package)_patch_dir)/fix_variadic_warning.patch && \
1011
mkdir -p $($(package)_staging_prefix_dir)/include/sys && \
1112
cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h
1213
endef
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Could be dropped after a migration to C++20.
2+
See: https://github.com/bitcoin/bitcoin/issues/26916.
3+
4+
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
5+
index 4075a5f..7c6138c 100644
6+
--- a/includes/sys/sdt.h
7+
+++ b/includes/sys/sdt.h
8+
@@ -276,7 +276,7 @@ __extension__ extern unsigned long long __sdt_unsp;
9+
_SDT_ASM_1(.purgem _SDT_TYPE_) \
10+
_SDT_ASM_1(.purgem _SDT_TYPE)
11+
12+
-#define _SDT_ASM_BODY(provider, name, pack_args, args, ...) \
13+
+#define _SDT_ASM_BODY(provider, name, pack_args, args) \
14+
_SDT_DEF_MACROS \
15+
_SDT_ASM_1(990: _SDT_NOP) \
16+
_SDT_ASM_3( .pushsection .note.stapsdt,_SDT_ASM_AUTOGROUP,"note") \

0 commit comments

Comments
 (0)