diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2022-09-13 20:35:56 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-01-23 18:12:26 +0000 |
| commit | df7ae8b7ca9cf53357d6a1c6bb70a2e40d2a1017 (patch) | |
| tree | 1ee6346636f49bcc83a0577722dfb0df3b56e89e /depends | |
| parent | a66d82e25f866ee72417fca7adae8feaddc8bdb0 (diff) | |
| download | bitcoin-df7ae8b7ca9cf53357d6a1c6bb70a2e40d2a1017.tar.xz | |
depends: systemtap: remove variadic params that trigger compiler warnings
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/systemtap.mk | 3 | ||||
| -rw-r--r-- | depends/patches/systemtap/fix_variadic_warning.patch | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/depends/packages/systemtap.mk b/depends/packages/systemtap.mk index c912e18c31..541ebeee01 100644 --- a/depends/packages/systemtap.mk +++ b/depends/packages/systemtap.mk @@ -3,10 +3,11 @@ $(package)_version=4.8 $(package)_download_path=https://sourceware.org/ftp/systemtap/releases/ $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=cbd50a4eba5b261394dc454c12448ddec73e55e6742fda7f508f9fbc1331c223 -$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch +$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch fix_variadic_warning.patch define $(package)_preprocess_cmds patch -p1 < $($(package)_patch_dir)/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch && \ + patch -p1 < $($(package)_patch_dir)/fix_variadic_warning.patch && \ mkdir -p $($(package)_staging_prefix_dir)/include/sys && \ cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h endef diff --git a/depends/patches/systemtap/fix_variadic_warning.patch b/depends/patches/systemtap/fix_variadic_warning.patch new file mode 100644 index 0000000000..93cc2d6081 --- /dev/null +++ b/depends/patches/systemtap/fix_variadic_warning.patch @@ -0,0 +1,16 @@ +Could be dropped after a migration to C++20. +See: https://github.com/bitcoin/bitcoin/issues/26916. + +diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h +index 4075a5f..7c6138c 100644 +--- a/includes/sys/sdt.h ++++ b/includes/sys/sdt.h +@@ -276,7 +276,7 @@ __extension__ extern unsigned long long __sdt_unsp; + _SDT_ASM_1(.purgem _SDT_TYPE_) \ + _SDT_ASM_1(.purgem _SDT_TYPE) + +-#define _SDT_ASM_BODY(provider, name, pack_args, args, ...) \ ++#define _SDT_ASM_BODY(provider, name, pack_args, args) \ + _SDT_DEF_MACROS \ + _SDT_ASM_1(990: _SDT_NOP) \ + _SDT_ASM_3( .pushsection .note.stapsdt,_SDT_ASM_AUTOGROUP,"note") \ |