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

6047e25035 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 6047e25035. That patch isn't needed anymore.
  TheCharlatan:
    ACK 6047e25035

Tree-SHA512: 3adac4078d4d8f9999a6a11c4d164d9afbb68feda0459a7a74316963a80f3fb84e49989b74d2ab0bfc17cae9cec3d4a10768f7cec872d6bfc5805d65d9e16e6b
pull/29186/head
fanquake 10 months ago
commit cb6d619931
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1

@ -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

@ -1,16 +0,0 @@
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") \
Loading…
Cancel
Save