From d03ac3403a673a9be541f95579f2fb55a145eaf7 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 23 Jul 2024 13:28:08 +0200 Subject: [PATCH] Add systemtap-sdt-devel to build Ruby with systemtap sdt header files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add systemtap-sdt-devel as BuildRequires to build Ruby with systemtap sdt header files. The commit[1] on systemtap rawhide by the change[2] on systemtap-5.2~pre17206355g1a07290a-2.fc41 or later versions caused the following error in the `test_systemtap.rb`. Because the `readelf -S "#{LIBRUBY_SO}"` in the `test_systemtap.rb` failed to find the systemtap section headers in the `libruby.so` file. We relied on the `BuildRequires: %{_bindir}/dtrace` BuildRequires to bring in all required files for systemtap support. However, after the change[1] that the systemtap package was split, now we need to require systemtap sdt header files on top of the dtrace executable to build Ruby with systemtap support to fix the error. ``` + make -C redhat-linux-build runruby TESTRUN_SCRIPT=/builddir/build/SOURCES/test_systemtap.rb make: Entering directory '/builddir/build/BUILD/ruby-3.3.4-build/ruby-3.3.4/redhat-linux-build' RUBY_ON_BUG='gdb -x /builddir/build/BUILD/ruby-3.3.4-build/ruby-3.3.4/.gdbinit -p' ./miniruby -I/builddir/build/BUILD/ruby-3.3.4-build/ruby-3.3.4/lib -I. -I.ext/common /builddir/build/BUILD/ruby-3.3.4-build/ruby-3.3.4/tool/runruby.rb --extout=.ext -- --disable-gems /builddir/build/SOURCES/test_systemtap.rb ERROR: SystemTap (DTrace) headers were not detected in resulting library. ``` Co-authored-by: Lumír Balhar [1] https://src.fedoraproject.org/rpms/systemtap/c/93948388bc54cd7a4efb1806d9787291d26b33d6?branch=rawhide [2] https://fedoraproject.org/wiki/Changes/Separate_dtrace_package --- ruby.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 55f2cf5..a59290e 100644 --- a/ruby.spec +++ b/ruby.spec @@ -171,7 +171,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version}%{?development_release} -Release: 12%{?dist} +Release: 13%{?dist} # Licenses, which are likely not included in binary RPMs: # Apache-2.0: # benchmark/gc/redblack.rb @@ -294,6 +294,7 @@ BuildRequires: openssl-devel BuildRequires: zlib-devel %{?with_gmp:BuildRequires: gmp-devel} %{?with_systemtap:BuildRequires: %{_bindir}/dtrace} +%{?with_systemtap:BuildRequires: systemtap-sdt-devel} %{?with_yjit:BuildRequires: %{_bindir}/rustc} # Install section @@ -1715,6 +1716,10 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog +* Mon Jul 29 2024 Jun Aruga - 3.3.4-13 +- Add systemtap-sdt-devel to build Ruby with systemtap sdt header files. + Co-authored-by: Lumír Balhar + * Fri Jul 19 2024 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild