Merge bitcoin/bitcoin#29181: build: remove systemtap variadic patch

6047e25 Revert "depends: systemtap: remove variadic params that trigger compiler warnings" (fanquake) Pull request description: We now use C++20. ACKs for top commit: 0xB10C: ACK 6047e25. That patch isn't needed anymore. TheCharlatan: ACK 6047e25 Tree-SHA512: 3adac4078d4d8f9999a6a11c4d164d9afbb68feda0459a7a74316963a80f3fb84e49989b74d2ab0bfc17cae9cec3d4a10768f7cec872d6bfc5805d65d9e16e6b
bitcoin-core · Jan 5, 2024 · cb6d619 · cb6d619
2 parents 7c248b9 + 6047e25
commit cb6d619
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/depends/packages/systemtap.mk b/depends/packages/systemtap.mk
@@ -3,11 +3,10 @@ $(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 fix_variadic_warning.patch
+$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.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