Skip to content

Commit cb6d619

Browse files
committed
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
2 parents 7c248b9 + 6047e25 commit cb6d619

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

depends/packages/systemtap.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ $(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 fix_variadic_warning.patch
6+
$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.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 && \
1110
mkdir -p $($(package)_staging_prefix_dir)/include/sys && \
1211
cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h
1312
endef

depends/patches/systemtap/fix_variadic_warning.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)