The sys/sdt.h header is required to build Bitcoin Core with Userspace Statically Defined Tracing support. Systemtap version 4.5 (May 2021) is used as the most recent version 4.6 (Nov 2021) fails to build. See e.g. https://sourceware.org/git/?p=systemtap.git;a=commit;h=1d3653936fc1fd13135a723a27e6c7e959793ad0 As Systemtap itself is not needed, the build steps (configure and make) are skipped. We require fewer build dependecies and don't waste time building depends we don't end up using. However, the configure step would normally processes sys/sdt-config.h.in. The resulting sdt-config.h defines _SDT_ASM_SECTION_AUTOGROUP_SUPPORT (either 0 or 1 to indicate whether the assembler supports "?" in .pushsection directives). For now, we assume all currently used assemblers supports this feature and remove the check from the sys/sdt.h header file in a patch. Co-authored-by: Michael Ford <fanquake@gmail.com>pull/826/head
0xb10c
3 years ago
parent
38146a4bd2
commit
e158a2a7aa
@ -0,0 +1,12 @@
|
||||
package=systemtap
|
||||
$(package)_version=4.5
|
||||
$(package)_download_path=https://sourceware.org/systemtap/ftp/releases/
|
||||
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
||||
$(package)_sha256_hash=75078ed37e0dd2a769c9d1f9394170b2d9f4d7daa425f43ca80c13bad6cfc925
|
||||
$(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 && \
|
||||
mkdir -p $($(package)_staging_prefix_dir)/include/sys && \
|
||||
cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h
|
||||
endef
|
||||
@ -0,0 +1,31 @@
|
||||
commit b92d4c121486f3c6e8a2cea537c53eb09894479a
|
||||
Author: 0xb10c <0xb10c@gmail.com>
|
||||
Date: Tue Dec 7 11:02:07 2021 +0100
|
||||
|
||||
Remove _SDT_ASM_SECTION_AUTOGROUP_SUPPORT check
|
||||
|
||||
We assume that the assembler supports "?" in .pushsection directives.
|
||||
This enables us to skip configure and make.
|
||||
|
||||
See https://github.com/bitcoin/bitcoin/issues/23297.
|
||||
|
||||
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
|
||||
index 97766e710..352b4ee25 100644
|
||||
--- a/includes/sys/sdt.h
|
||||
+++ b/includes/sys/sdt.h
|
||||
@@ -230,12 +230,10 @@ __extension__ extern unsigned long long __sdt_unsp;
|
||||
nice with code in COMDAT sections, which comes up in C++ code.
|
||||
Without that assembler support, some combinations of probe placements
|
||||
in certain kinds of C++ code may produce link-time errors. */
|
||||
-#include "sdt-config.h"
|
||||
-#if _SDT_ASM_SECTION_AUTOGROUP_SUPPORT
|
||||
+/* PATCH: We assume that the assembler supports the feature. This
|
||||
+ enables us to skip configure and make. In turn, this means we
|
||||
+ require fewer dependencies and have shorter depend build times. */
|
||||
# define _SDT_ASM_AUTOGROUP "?"
|
||||
-#else
|
||||
-# define _SDT_ASM_AUTOGROUP ""
|
||||
-#endif
|
||||
|
||||
#define _SDT_ASM_BODY(provider, name, pack_args, args) \
|
||||
_SDT_ASM_1(990: _SDT_NOP) \
|
||||
Loading…
Reference in new issue