Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bpftrace for openSUSE:Factory
checked in at 2024-11-05 15:41:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bpftrace (Old)
and /work/SRC/openSUSE:Factory/.bpftrace.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bpftrace"
Tue Nov 5 15:41:39 2024 rev:29 rq:1221317 version:0.21.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/bpftrace/bpftrace.changes 2024-10-28
15:24:17.453387867 +0100
+++ /work/SRC/openSUSE:Factory/.bpftrace.new.2020/bpftrace.changes
2024-11-05 15:42:05.976787653 +0100
@@ -1,0 +2,12 @@
+Fri Nov 1 14:56:49 UTC 2024 - Petr Vorel <pvo...@suse.cz>
+
+- Backport fix for tools/bashreadline.bt needed for openQA testing
+ (bsc#1232536)
+ 0001-tools-bashreadline-fix-probe-for-dynamically-linked-.patch
+
+-------------------------------------------------------------------
+Wed Oct 30 12:21:20 UTC 2024 - Shung-Hsi Yu <shung-hsi...@suse.com>
+
+- Switch to gcc for compilation (bsc#1219008)
+
+-------------------------------------------------------------------
New:
----
0001-tools-bashreadline-fix-probe-for-dynamically-linked-.patch
BETA DEBUG BEGIN:
New: (bsc#1232536)
0001-tools-bashreadline-fix-probe-for-dynamically-linked-.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bpftrace.spec ++++++
--- /var/tmp/diff_new_pack.F6dBZj/_old 2024-11-05 15:42:08.036873956 +0100
+++ /var/tmp/diff_new_pack.F6dBZj/_new 2024-11-05 15:42:08.048874459 +0100
@@ -16,13 +16,16 @@
#
-# Use default LLVM on openSUSE unless it is not yet supported
-%if 0%{?suse_version} >= 1600 || 0%{?is_opensuse}
+# Use default LLVM unless it is not yet supported
+%if 0%{?suse_version} >= 1600
%if 0%{?product_libs_llvm_ver} > 18
%define llvm_major_version 18
%else
%define llvm_major_version %{nil}
%endif
+ %define gcc_package gcc-c++
+ %define gcc_binary gcc
+ %define gxx_binary g++
%else
# Hard-code latest LLVM for SLES, the default version is too old
%if 0%{?sle_version} == 150600
@@ -36,6 +39,9 @@
%endif
%endif
%endif
+ %define gcc_package gcc13-c++
+ %define gcc_binary gcc-13
+ %define gxx_binary g++-13
%endif
Name: bpftrace
@@ -46,10 +52,12 @@
Group: Development/Tools/Debuggers
URL: https://github.com/iovisor/bpftrace
Source:
https://github.com/iovisor/bpftrace/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
0001-tools-bashreadline-fix-probe-for-dynamically-linked-.patch bsc#1232536
+Patch0: 0001-tools-bashreadline-fix-probe-for-dynamically-linked-.patch
+BuildRequires: %gcc_package
BuildRequires: binutils
BuildRequires: binutils-devel
BuildRequires: bison
-BuildRequires: clang%{llvm_major_version}
BuildRequires: clang%{llvm_major_version}-devel
BuildRequires: cmake
BuildRequires: flex
@@ -95,8 +103,8 @@
%build
# We need to build with clang, enable LTO via CMake instead.
%define _lto_cflags %{nil}
-export CC="clang"
-export CXX="clang++"
+export CC="%gcc_binary"
+export CXX="%gxx_binary"
%cmake \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=TRUE \
-DLLVM_REQUESTED_VERSION="${LLVM_VERSION}" \
++++++ 0001-tools-bashreadline-fix-probe-for-dynamically-linked-.patch ++++++
>From 14b83ac87608ab359f3913b86d31e6f02665f66d Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ail...@suse.com>
Date: Thu, 31 Oct 2024 17:56:11 +0100
Subject: [PATCH] tools/bashreadline: fix probe for dynamically linked readline
Upstream-status: sent to https://github.com/bpftrace/bpftrace/pull/3564/
Fixes: bsc#1232536
When bash links against libreadline dynamically, the probe fails as the
readline symbol is undefined until runtime. Fix this issue by adding a
fallback probe that hooks directly into libreadline.
Signed-off-by: Anthony Iliopoulos <ail...@suse.com>
[ pvorel: remove CHANGELOG.md change ]
Signed-off-by: Petr Vorel <pvo...@suse.cz>
Signed-off-by: Shung-Hsi Yu <shung-hsi...@suse.com>
---
tools/bashreadline.bt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/bashreadline.bt b/tools/bashreadline.bt
index 859ed6fe..30a1e706 100755
--- a/tools/bashreadline.bt
+++ b/tools/bashreadline.bt
@@ -15,13 +15,17 @@
* 06-Sep-2018 Brendan Gregg Created this.
*/
+config = { missing_probes = "ignore" }
+
BEGIN
{
printf("Tracing bash commands... Hit Ctrl-C to end.\n");
printf("%-9s %-6s %s\n", "TIME", "PID", "COMMAND");
}
-uretprobe:/bin/bash:readline
+uretprobe:/bin/bash:readline,
+uretprobe:libreadline:readline
+/comm == "bash"/
{
time("%H:%M:%S ");
printf("%-6d %s\n", pid, str(retval));
--
2.45.2
