diff options
| author | fanquake <fanquake@gmail.com> | 2023-01-26 13:37:34 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-01-26 13:37:48 +0000 |
| commit | eee2c2898575fd115a34954e5f8f1543784eebe1 (patch) | |
| tree | ba33423e60325a518d7cfdc283ae260e5a97bff4 /depends | |
| parent | 79e007d1d60b8d600479d787667d91e05a492ab4 (diff) | |
| parent | df7ae8b7ca9cf53357d6a1c6bb70a2e40d2a1017 (diff) | |
| download | bitcoin-eee2c2898575fd115a34954e5f8f1543784eebe1.tar.xz | |
Merge bitcoin/bitcoin#26945: depends: systemtap 4.8
df7ae8b7ca9cf53357d6a1c6bb70a2e40d2a1017 depends: systemtap: remove variadic params that trigger compiler warnings (Cory Fields)
a66d82e25f866ee72417fca7adae8feaddc8bdb0 depends: systemtap 4.8 (fanquake)
Pull request description:
Updates systemtap to 4.8.
Includes acc2895a66a4b654e9a0a05ed0927f67f48c75b2 from #25972.
Will half (depends) fix #26916.
Release notes etc: https://lwn.net/Articles/913908/.
ACKs for top commit:
0xB10C:
ACK df7ae8b7ca9cf53357d6a1c6bb70a2e40d2a1017
hebasto:
re-ACK df7ae8b7ca9cf53357d6a1c6bb70a2e40d2a1017.
Tree-SHA512: 0f64fba87888058380183f38b6ace7b71f4a8b5503eb32b82b283a40c99d92c449c60deecc2386df5084235cfd760af6c1e7f432fa1bd30f97bb42f100f23d62
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/systemtap.mk | 7 | ||||
| -rw-r--r-- | depends/patches/systemtap/fix_variadic_warning.patch | 16 |
2 files changed, 20 insertions, 3 deletions
diff --git a/depends/packages/systemtap.mk b/depends/packages/systemtap.mk index ad74323d98..541ebeee01 100644 --- a/depends/packages/systemtap.mk +++ b/depends/packages/systemtap.mk @@ -1,12 +1,13 @@ package=systemtap -$(package)_version=4.7 +$(package)_version=4.8 $(package)_download_path=https://sourceware.org/ftp/systemtap/releases/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=43a0a3db91aa4d41e28015b39a65e62059551f3cc7377ebf3a3a5ca7339e7b1f -$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch +$(package)_sha256_hash=cbd50a4eba5b261394dc454c12448ddec73e55e6742fda7f508f9fbc1331c223 +$(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") \ |