Accepting request 911975 from home:michals

- 15.4 has new elfutils, drop libebl-plugins dependency.
- Update to version 1.21+git177.1ef87b2:
  * Fix crash with split BTF debuginfo
  * CMakeList.txt: Bump version to the upcoming 1.22 release, not out of the door yet
  - Remove upstreamed patch dwarves-Prep-1.22.patch

OBS-URL: https://build.opensuse.org/request/show/911975
OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=75
This commit is contained in:
Jan Engelhardt 2021-08-13 14:54:29 +00:00 committed by Git OBS Bridge
parent c6fcc3b39f
commit 32c85307f7
5 changed files with 19 additions and 22 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ca6190d1ae24570a4162a085b9c525a9b7235e8c2a46ea655bbce248df90172
size 910348

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c6ad2458d9ac5d60ab84fc150481e0f1331a6b90b917719542e47ec02738ef3f
size 910360

View File

@ -1,14 +0,0 @@
--- dwarves-1.21+git175.1ef87b2/CMakeLists.txt 2021-06-17 02:07:22.000000000 +0200
+++ dwarves-1.21+git175.1ef87b2/CMakeLists.txt 2021-07-15 22:09:41.020434732 +0200
@@ -53,9 +53,9 @@
endif (NOT DEFINED BUILD_SHARED_LIBS)
# Just for grepping, DWARVES_VERSION isn't used anywhere anymore
-# add_definitions(-D_GNU_SOURCE -DDWARVES_VERSION="v1.21")
+# add_definitions(-D_GNU_SOURCE -DDWARVES_VERSION="v1.22")
add_definitions(-D_GNU_SOURCE -DDWARVES_MAJOR_VERSION=1)
-add_definitions(-D_GNU_SOURCE -DDWARVES_MINOR_VERSION=21)
+add_definitions(-D_GNU_SOURCE -DDWARVES_MINOR_VERSION=22)
find_package(DWARF REQUIRED)
find_package(ZLIB REQUIRED)

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Aug 13 11:35:30 UTC 2021 - msuchanek@suse.com
- 15.4 has new elfutils, drop libebl-plugins dependency.
- Update to version 1.21+git177.1ef87b2:
* Fix crash with split BTF debuginfo
* CMakeList.txt: Bump version to the upcoming 1.22 release, not out of the door yet
- Remove upstreamed patch dwarves-Prep-1.22.patch
-------------------------------------------------------------------
Sat Jul 17 15:48:30 UTC 2021 - Michal Suchanek <msuchanek@suse.com>

View File

@ -19,9 +19,12 @@
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300
%define have_libbpf 1
%endif
%if ( 0%{?sle_version} && 0%{?sle_version} <= 150300 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
%define have_libebl-plugins 1
%endif
Name: dwarves
Version: 1.21+git175.1ef87b2
Version: 1.21+git177.1ef87b2
Release: 0
Summary: DWARF utilities
License: GPL-2.0-only
@ -29,11 +32,10 @@ Group: Development/Tools/Debuggers
URL: https://acmel.wordpress.com/
#Git-Clone: git://git.kernel.org/pub/scm/devel/pahole/pahole
#Git-Web: http://git.kernel.org/cgit/devel/pahole/pahole.git
Source: %name-%version.tar.xz
Source: %{name}-%{version}.tar.xz
#Source: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz
#Source2: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign
Source9: baselibs.conf
Patch0: dwarves-Prep-1.22.patch
BuildRequires: cmake
BuildRequires: libdw-devel >= 0.171
BuildRequires: libelf-devel
@ -44,7 +46,7 @@ BuildRequires: pkgconfig(libbpf) >= 0.4.0
BuildRequires: pkgconfig(zlib)
# Also known by its most prominent tool
Provides: pahole = %version-%release
%if 0%{?suse_version} < 1550
%if 0%{?have_libebl_plugins}
BuildRequires: libebl-devel
%endif
@ -70,7 +72,7 @@ about inlining, etc.
%package -n libdwarves1
Summary: DWARF processing libraries of dwarves tools
Group: System/Libraries
%if 0%{?suse_version} < 1550
%if 0%{?have_libebl_plugins}
Requires: libebl-plugins
%endif