diff --git a/0001-testsuite-Handle-readelf-following-links-by-default.patch b/0001-testsuite-Handle-readelf-following-links-by-default.patch deleted file mode 100644 index e0514e801fc6c810f9335adb56b221c92933d809..0000000000000000000000000000000000000000 --- a/0001-testsuite-Handle-readelf-following-links-by-default.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b1f26dc76158e1f3364836d8b540b17a7a1ccb3d Mon Sep 17 00:00:00 2001 -From: Tom de Vries -Date: Sat, 20 Mar 2021 09:37:31 +0100 -Subject: [PATCH] [testsuite] Handle readelf following links by default - -Since binutils commit c46b706620e "Change the readelf and objdump programs so -that they will automatically follow links to separate debug info files" there -are a few FAILs in the dwz testsuite. - -This is just due to changing the default behaviour for readelf. - -Fix this by testing whether the new -Wn readelf flag is supported, -and if so, adding it to the readelf call. - -2021-03-20 Tom de Vries - - PR dwz/27592 - * testsuite/dwz.tests/odr-struct-multifile.sh: Call readelf with -wN - if supported. ---- - testsuite/dwz.tests/odr-struct-multifile.sh | 9 +++++++-- - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/testsuite/dwz.tests/odr-struct-multifile.sh b/testsuite/dwz.tests/odr-struct-multifile.sh -index cc462c9..20b682b 100644 ---- a/testsuite/dwz.tests/odr-struct-multifile.sh -+++ b/testsuite/dwz.tests/odr-struct-multifile.sh -@@ -2,6 +2,11 @@ if ! $execs/dwz-for-test --odr -v 2>/dev/null; then - exit 77 - fi - -+readelf_flags="" -+if readelf -h 2>&1 | grep -q "\-wN"; then -+ readelf_flags=-wN -+fi -+ - cp $execs/odr-struct 1 - cp 1 2 - -@@ -41,12 +46,12 @@ done - - - for name in aaa bbb ccc; do -- cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*:.*$name" || true) -+ cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true) - [ $cnt -eq 0 ] - done - - for name in member_one member_two member_three member_four; do -- cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*:.*$name" || true) -+ cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true) - [ $cnt -eq 0 ] - done - --- -2.19.1.6.gb485710b - diff --git a/dwz-0.14.tar.xz b/dwz-0.14.tar.xz deleted file mode 100644 index 3d6789fa0c184db8bf86243f17c6702be4a6637a..0000000000000000000000000000000000000000 Binary files a/dwz-0.14.tar.xz and /dev/null differ diff --git a/dwz-0.15.tar.xz b/dwz-0.15.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..d293ea07776b0fe2bc984c366466c493bb9eeea5 Binary files /dev/null and b/dwz-0.15.tar.xz differ diff --git a/dwz.spec b/dwz.spec index 9389bc1d953e77346c1ec9b36a8a30bc1304aa72..4acef3eefa72c4c17034a612afe4417d7db52de9 100644 --- a/dwz.spec +++ b/dwz.spec @@ -1,14 +1,12 @@ -%define anolis_release 2 +%define anolis_release 1 Summary: DWARF optimization and duplicate removal tool Name: dwz Url: https://sourceware.org/dwz/ -Version: 0.14 +Version: 0.15 Release: %{anolis_release}%{?dist} License: GPLv2+ and GPLv3+ Source: https://sourceware.org/ftp/dwz/releases/%{name}-%{version}.tar.xz -# backport from upstream to fix odr-struct-multifile.sh fained -Patch1: 0001-testsuite-Handle-readelf-following-links-by-default.patch -BuildRequires: gcc, gcc-c++, gdb, elfutils-libelf-devel, dejagnu +BuildRequires: gcc, gcc-c++, gdb, elfutils-libelf-devel, dejagnu, xxhash-devel BuildRequires: make %description @@ -20,6 +18,14 @@ duplication using techniques from DWARF standard appendix E - creating DW_TAG_partial_unit compilation units (CUs) for duplicated information and using DW_TAG_imported_unit to import it into each CU that needs it. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %prep %autosetup -p1 -n dwz @@ -34,7 +40,7 @@ rm -rf %{buildroot} %generate_compatibility_deps %check -make check +CFLAGS="" LDFLAGS="" make check %files %dir %{abidir} @@ -43,7 +49,13 @@ make check %{abidir}/dwz-option.list %{_mandir}/man1/dwz.1* +%files doc +%doc VERSION README* + %changelog +* Thu Feb 02 2023 Kaihao Bai - 0.15-1 +- update version to 0.15 + * Mon Oct 31 2022 mgb01105731 - 0.14-2 - optimise spec file