[packages/debugedit] - up to 5.1
baggins
baggins at pld-linux.org
Wed Feb 19 02:40:02 CET 2025
commit a39f9dd3a5ac68db73e6dac970ce2b844ac43288
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Feb 19 01:49:01 2025 +0100
- up to 5.1
...e-zero-directory-entry-in-.debug_line-DWA.patch | 130 ---------------------
builddir-readlink.patch | 2 +-
debugedit.spec | 15 ++-
3 files changed, 8 insertions(+), 139 deletions(-)
---
diff --git a/debugedit.spec b/debugedit.spec
index d449a8c..2dfaf2d 100644
--- a/debugedit.spec
+++ b/debugedit.spec
@@ -5,13 +5,12 @@
Summary: Tools for debuginfo creation
Summary(pl.UTF-8): Narzędzia do tworzenia plików z danymi dla debuggerów
Name: debugedit
-Version: 5.0
-Release: 5
+Version: 5.1
+Release: 1
License: GPL v3+, GPL v2+
Group: Development/Tools
-Source0: https://sourceware.org/ftp/debugedit/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 9961a1ae59b6417d27e3a646dc4078b7
-Patch0: 0001-tests-Handle-zero-directory-entry-in-.debug_line-DWA.patch
+Source0: https://sourceware.org/pub/debugedit/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 25b796b3998d3c33aedcac2216f34dd9
Patch1: no-exe-for-elf-debuginfo.patch
Patch2: builddir-readlink.patch
URL: https://sourceware.org/debugedit/
@@ -21,6 +20,7 @@ BuildRequires: elfutils-devel
BuildRequires: help2man
BuildRequires: pkgconfig
BuildRequires: tar >= 1:1.22
+BuildRequires: xxHash-devel
BuildRequires: xz
Requires: awk
Requires: binutils
@@ -47,9 +47,8 @@ profilowania oprogramowania.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
%build
%{__aclocal}
diff --git a/0001-tests-Handle-zero-directory-entry-in-.debug_line-DWA.patch b/0001-tests-Handle-zero-directory-entry-in-.debug_line-DWA.patch
deleted file mode 100644
index 2cadab2..0000000
--- a/0001-tests-Handle-zero-directory-entry-in-.debug_line-DWA.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From ae27211cbbfb63a0ad3c141cd1310d7f583ec40e Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark at klomp.org>
-Date: Fri, 30 Jul 2021 18:09:46 +0200
-Subject: [PATCH] tests: Handle zero directory entry in .debug_line DWARF5
- debugedit.at
-
-We were skipping the zero directory entry, because it was always
-the same as the directory entry at position one. But that isn't
-true anymore with gcc 11.2.1. There the zero dir entry is unique.
-Fix the debugedit.at .debug_line testcases using DWARF5 to also
-include dir entry zero.
-
-Signed-off-by: Mark Wielaard <mark at klomp.org>
----
- configure.ac | 14 ++++++++++++++
- tests/atlocal.in | 1 +
- tests/debugedit.at | 18 ++++++++++++------
- 3 files changed, 27 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e5c9230..6a53365 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -87,6 +87,20 @@ CFLAGS="$save_CFLAGS"
- GDWARF_5_FLAG=$ac_cv_gdwarf_5
- AC_SUBST([GDWARF_5_FLAG])
-
-+AC_CACHE_CHECK([whether -gdwarf-5 produced DWARF5 .debug_line], ac_cv_dwarf_5_debugline, [dnl
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="-gdwarf-5"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i=0;]],[[/* empty main */]])],
-+ [if readelf --debug-dump=line conftest.o 2>&1 | \
-+ grep "DWARF Version:" 2>&1 | grep "5" > /dev/null 2>&1; \
-+ then ac_cv_dwarf_5_debugline=yes; \
-+ else ac_cv_dwarf_5_debugline=no; fi],
-+ ac_cv_dwarf_5_debugline=no)
-+CFLAGS="$save_CFLAGS"
-+])
-+DWARF_5_DEBUGLINE=$ac_cv_dwarf_5_debugline
-+AC_SUBST([DWARF_5_DEBUGLINE])
-+
- AC_CACHE_CHECK([whether gcc supports -gz=none], ac_cv_gz_none, [dnl
- save_CFLAGS="$CFLAGS"
- CFLAGS="-gz=none"
-diff --git a/tests/atlocal.in b/tests/atlocal.in
-index 8399f8d..d916301 100644
---- a/tests/atlocal.in
-+++ b/tests/atlocal.in
-@@ -13,3 +13,4 @@ READELF="@READELF@"
-
- GDWARF_5_FLAG=@GDWARF_5_FLAG@
- GZ_NONE_FLAG=@GZ_NONE_FLAG@
-+DWARF_5_DEBUGLINE=@DWARF_5_DEBUGLINE@
-diff --git a/tests/debugedit.at b/tests/debugedit.at
-index 0311d26..725e68e 100644
---- a/tests/debugedit.at
-+++ b/tests/debugedit.at
-@@ -488,10 +488,12 @@ AT_CLEANUP
- AT_SETUP([debugedit .debug_line objects DWARF5])
- AT_KEYWORDS([debuginfo] [debugedit])
- AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
-+AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
- DEBUGEDIT_SETUP([-gdwarf-5])
-
- AT_DATA([expout],
- [foo/bar/baz
-+foo/bar/baz/subdir_bar
- foo/bar/baz/subdir_headers
- ])
-
-@@ -500,8 +502,8 @@ AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o]])
- AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./baz.o]])
- AT_CHECK([[
- readelf --debug-dump=line foo.o subdir_bar/bar.o baz.o \
-- | grep -A5 "The Directory Table" | grep "^ [123]" \
-- | cut -f2- -d/ | grep ^foo/ | sort
-+ | grep -A5 "The Directory Table" | grep "^ [0123]" \
-+ | cut -f2- -d/ | grep ^foo/ | sort -u
- ]],[0],[expout])
-
- AT_CLEANUP
-@@ -535,18 +537,20 @@ AT_CLEANUP
- AT_SETUP([debugedit .debug_line partial DWARF5])
- AT_KEYWORDS([debuginfo] [debugedit])
- AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
-+AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
- DEBUGEDIT_SETUP([-gdwarf-5])
-
- AT_DATA([expout],
- [foo/bar/baz
-+foo/bar/baz/subdir_bar
- foo/bar/baz/subdir_headers
- ])
-
- AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o]])
- AT_CHECK([[
- readelf --debug-dump=line ./foobarbaz.part.o \
-- | grep -A5 "The Directory Table" | grep "^ [123]" \
-- | cut -f2- -d/ | grep ^foo/ | sort
-+ | grep -A5 "The Directory Table" | grep "^ [0123]" \
-+ | cut -f2- -d/ | grep ^foo/ | sort -u
- ]],[0],[expout])
-
- AT_CLEANUP
-@@ -580,18 +584,20 @@ AT_CLEANUP
- AT_SETUP([debugedit .debug_line exe DWARF5])
- AT_KEYWORDS([debuginfo] [debugedit])
- AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
-+AT_SKIP_IF([test "$DWARF_5_DEBUGLINE" = "no"])
- DEBUGEDIT_SETUP([-gdwarf-5])
-
- AT_DATA([expout],
- [foo/bar/baz
-+foo/bar/baz/subdir_bar
- foo/bar/baz/subdir_headers
- ])
-
- AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe]])
- AT_CHECK([[
- readelf --debug-dump=line ./foobarbaz.exe \
-- | grep -A5 "The Directory Table" | grep "^ [123]" \
-- | cut -f2- -d/ | grep ^foo/ | sort
-+ | grep -A5 "The Directory Table" | grep "^ [0123]" \
-+ | cut -f2- -d/ | grep ^foo/ | sort -u
- ]],[0],[expout])
-
- AT_CLEANUP
---
-2.27.0
-
diff --git a/builddir-readlink.patch b/builddir-readlink.patch
index 3eac9ff..4fdcc19 100644
--- a/builddir-readlink.patch
+++ b/builddir-readlink.patch
@@ -11,7 +11,7 @@
if [ "$no_recompute_build_id" = "true" ]; then
no_recompute="-n"
@@ -398,6 +400,11 @@
- $strict && exit 2
+ $strict && return 2
fi
+ if [ ! -s "$SOURCEFILE" ]; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/debugedit.git/commitdiff/a39f9dd3a5ac68db73e6dac970ce2b844ac43288
More information about the pld-cvs-commit
mailing list