Accepting request 769807 from devel:tools

bsc#1161296

OBS-URL: https://build.opensuse.org/request/show/769807
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=109
This commit is contained in:
Dominique Leuenberger 2020-02-04 18:51:37 +00:00 committed by Git OBS Bridge
commit 587f33aeaf
7 changed files with 73 additions and 7 deletions

View File

@ -0,0 +1,27 @@
From: Siddhesh Poyarekar <siddhesh@gotplt.org>
Date: Mon Jan 27 12:56:22 2020 +0530
Subject: Amend fallback comment to work with newer gcc
Git-commit: eae455d2091cc67d1bfe1fa08430a368db64fb1e
References: bsc#1161296
Signed-off-by: Tony Jones <tonyj@suse.de>
Amend fallback comment to work with newer gcc
Newer gcc does not recognize the fallthrough comment due to the text
following the fallthrough keyword. The "see above" doesn't seem too
valuable, so this patch drops it to fix the build.
diff --git a/runtime/unwind/unwind.h b/runtime/unwind/unwind.h
index e5a5921ed..7fbe7cc61 100644
--- a/runtime/unwind/unwind.h
+++ b/runtime/unwind/unwind.h
@@ -160,7 +160,7 @@ static unsigned long read_ptr_sect(const u8 **pLoc, const void *end,
#else
BUILD_BUG_ON(sizeof(u32) != sizeof(value));
#endif
- /* fallthrough, see above. */
+ /* fallthrough */
case DW_EH_PE_absptr:
if (compat_task)
{

View File

@ -1,7 +1,7 @@
#
# spec file for package systemtap-docs
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -35,7 +35,7 @@ BuildRequires: automake
BuildRequires: fop
BuildRequires: gcc-c++
BuildRequires: latex2html
BuildRequires: libebl-devel
BuildRequires: libdw-devel
BuildRequires: pkgconfig
BuildRequires: python3-devel
BuildRequires: python3-setuptools

View File

@ -1,7 +1,7 @@
#
# spec file for package systemtap-dtrace
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

View File

@ -0,0 +1,21 @@
From: Craig Ringer <craig.ringer@2ndquadrant.com>
Date: Sun Dec 29 14:51:47 2019 -0500
Subject: fix strict-prototypes in autoconf-stack-trace-save-regs.c
Git-commit: 3d571c2ab5797b41d07b51a7bbff626270d1e263
References: bsc#1161296
Signed-off-by: Tony Jones <tonyj@suse.de>
PR25265: fix strict-prototypes nit autoconf-stack-trace-save-regs.c
diff --git a/runtime/linux/autoconf-stack-trace-save-regs.c b/runtime/linux/autoconf-stack-trace-save-regs.c
index 8bf33391f..1fd515f8f 100644
--- a/runtime/linux/autoconf-stack-trace-save-regs.c
+++ b/runtime/linux/autoconf-stack-trace-save-regs.c
@@ -1,6 +1,6 @@
#include <linux/stacktrace.h>
-unsigned int foo ()
+unsigned int foo (void)
{
unsigned long e[10];
struct pt_regs* r = 0;

View File

@ -1,7 +1,7 @@
#
# spec file for package systemtap-headers
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Feb 3 23:01:33 UTC 2020 - Tony Jones <tonyj@suse.com>
- Resolve protoype issue when invoking tracebacks (bsc#1161296)
Also dependent fix to handle GCC fallthrough
New patch: systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch
New patch: systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch
-------------------------------------------------------------------
Mon Jan 27 11:29:47 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Replace libebl-devel BuildRequires with libdw-devel: ebl is
being absorbed by libdw.
-------------------------------------------------------------------
Fri Dec 6 17:29:35 UTC 2019 - Tony Jones <tonyj@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package systemtap
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -33,12 +33,14 @@ Source3: README-BEFORE-ADDING-PATCHES
Source4: README-KEYRING
Source5: stap-server.conf
Patch1: systemtap-build-source-dir.patch
Patch2: systemtap-fix-strict-prototypes-in-autoconf-stack-trace-save-regs.c.patch
Patch3: systemtap-amend-fallback-comment-to-work-with-newer-gcc.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libavahi-devel
BuildRequires: libcap-devel
BuildRequires: libebl-devel
BuildRequires: libdw-devel
BuildRequires: mozilla-nspr-devel
BuildRequires: mozilla-nss-devel
BuildRequires: mozilla-nss-tools
@ -48,7 +50,6 @@ BuildRequires: sqlite-devel
BuildRequires: pkgconfig(systemd)
Requires: %{name}-dtrace = %{version}
Requires: %{name}-runtime = %{version}-%{release}
Requires: libebl1
Obsoletes: systemtap-client < 1.5
%description
@ -95,6 +96,8 @@ This package contains the support tools for static probes.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
autoreconf -fi