Accepting request 912007 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/912007
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dwarves?expand=0&rev=33

dwarves-1.21+git175.1ef87b2.tar.xz

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

dwarves-1.21+git177.1ef87b2.tar.xz

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

dwarves-Prep-1.22.patch

@@ -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)
- 

dwarves.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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>
+
+- Use system libbpf when available (bsc#1188420 bsc#1188419 jsc#SLE-17288 jsc#SLE-18805).
+
 -------------------------------------------------------------------
 Thu Jul 15 20:04:36 UTC 2021 - msuchanek@suse.com
 

dwarves.spec

@@ -16,8 +16,15 @@
 #
 
 
+%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,16 +36,17 @@ 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
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(libbpf)
+%if 0%{?have_libbpf}
+BuildRequires:  pkgconfig(libbpf) >= 0.4.0
+%endif
 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
 
@@ -64,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
 
@@ -93,7 +101,11 @@ for processing DWARF, a debugging data format for ELF files.
 sv="$PWD/lib.v"
 ver=$(echo %version | cut -d+ -f1)
 echo "DWARVES_$ver{ global: *; };" >"$sv"
-%cmake -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--version-script=$sv"
+%cmake -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--version-script=$sv" \
+%if 0%{?have_libbpf}
+	-DLIBBPF_EMBEDDED=OFF \
+%endif
+	%nil
 %cmake_build
 
 %install