phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

depends: systemtap: remove variadic params that trigger compiler warnings

Browse source
This commit is contained in:
Cory Fields 2022-09-13 20:35:56 +00:00 • committed by fanquake
parent a66d82e25f
commit df7ae8b7ca
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
depends/packages/systemtap.mk
View file

@ -3,10 +3,11 @@ $(package)_version=4.8
$(package)_download_path=https://sourceware.org/ftp/systemtap/releases/ $(package)_download_path=https://sourceware.org/ftp/systemtap/releases/
$(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=cbd50a4eba5b261394dc454c12448ddec73e55e6742fda7f508f9fbc1331c223 $(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 define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch && \ 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 && \ mkdir -p $($(package)_staging_prefix_dir)/include/sys && \
cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h
endef endef

16
depends/patches/systemtap/fix_variadic_warning.patch Normal file
View file

@ -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") \