diff --git a/cfi-fix.patch b/cfi-fix.patch deleted file mode 100644 index 59bf1f8..0000000 --- a/cfi-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/tests/run-next-cfi-self.sh b/tests/run-next-cfi-self.sh -index 2c42ea3f..fa91b746 100755 ---- a/tests/run-next-cfi-self.sh -+++ b/tests/run-next-cfi-self.sh -@@ -18,4 +18,5 @@ - . $srcdir/test-subr.sh - - # Sanity check toolchain/dwarf_next_cfi --testrun_on_self ${abs_builddir}/next_cfi -+testrun_on_self_exe ${abs_builddir}/next_cfi -+testrun_on_self_lib ${abs_builddir}/next_cfi diff --git a/elfutils-debuginfod.changes b/elfutils-debuginfod.changes index 37b0072..67c1d83 100644 --- a/elfutils-debuginfod.changes +++ b/elfutils-debuginfod.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 15 07:12:57 UTC 2020 - Martin Liška + +- Remove remove-run-large-elf-file.sh.patch as it now checks for memory + size. +- Use autosetup. + ------------------------------------------------------------------- Thu Jun 11 18:19:10 UTC 2020 - Martin Liška diff --git a/elfutils-debuginfod.spec b/elfutils-debuginfod.spec index 933e6ef..f85a224 100644 --- a/elfutils-debuginfod.spec +++ b/elfutils-debuginfod.spec @@ -29,7 +29,6 @@ Source: https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfuti Source1: https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfutils-%{version}.tar.bz2.sig Source2: elfutils.changes Source3: elfutils.keyring -Patch0: remove-run-large-elf-file.sh.patch Patch1: 0001-tests-Add-GCOV-flags-when-necessary.patch BuildRequires: autoconf BuildRequires: automake @@ -89,9 +88,7 @@ The elfutils-debuginfod-client package contains a command-line frontend. %lang_package %prep -%setup -q -n elfutils-%version -%patch0 -p1 -%patch1 -p1 +%autosetup -n elfutils-%version -p1 %build %global _lto_cflags %{_lto_cflags} -flto-partition=none -Wno-error=stack-usage= diff --git a/elfutils.changes b/elfutils.changes index 6db41a3..ce8cdd9 100644 --- a/elfutils.changes +++ b/elfutils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 15 07:12:38 UTC 2020 - Martin Liška + +- Remove cfi-fix.patch - should not be needed now. +- Remove remove-run-large-elf-file.sh.patch as it now checks for memory + size. +- Use autosetup. + ------------------------------------------------------------------- Thu Jun 11 18:19:10 UTC 2020 - Martin Liška diff --git a/elfutils.spec b/elfutils.spec index d5ccfe7..739a826 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -31,8 +31,6 @@ Source1: README-BEFORE-ADDING-PATCHES Source2: baselibs.conf Source3: %{name}.changes Source5: %{name}.keyring -Patch2: cfi-fix.patch -Patch3: remove-run-large-elf-file.sh.patch Patch4: 0001-tests-Add-GCOV-flags-when-necessary.patch BuildRequires: autoconf BuildRequires: automake @@ -107,10 +105,7 @@ applications that require libdw. %lang_package %prep -%setup -q -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%autosetup -p1 %build %global _lto_cflags %{_lto_cflags} -flto-partition=none -Wno-error=stack-usage= diff --git a/remove-run-large-elf-file.sh.patch b/remove-run-large-elf-file.sh.patch deleted file mode 100644 index 140928e..0000000 --- a/remove-run-large-elf-file.sh.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e2b5eedefa1ed6a713a08e683eaaa5ae004492c3 Mon Sep 17 00:00:00 2001 -From: Martin Liska -Date: Wed, 27 Nov 2019 10:30:58 +0100 -Subject: [PATCH] Remove run-large-elf-file.sh test as it fails due to OOM. - ---- - tests/Makefile.am | 2 -- - tests/Makefile.in | 10 +--------- - 2 files changed, 1 insertion(+), 11 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 2ff7dfc..7cdbafc 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -84,7 +84,6 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \ - run-next-files.sh run-next-lines.sh \ - run-get-pubnames.sh run-get-aranges.sh run-allfcts.sh \ - run-show-abbrev.sh run-line2addr.sh hash \ -- run-large-elf-file.sh \ - newscn run-strip-test.sh run-strip-test2.sh \ - run-strip-test3.sh run-strip-test4.sh run-strip-test5.sh \ - run-strip-test6.sh run-strip-test7.sh run-strip-test8.sh \ -@@ -427,7 +426,6 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \ - testfile-riscv64-core.bz2 \ - run-reverse-sections.sh run-reverse-sections-self.sh \ - run-copyadd-sections.sh run-copymany-sections.sh \ -- run-large-elf-file.sh \ - run-typeiter-many.sh run-strip-test-many.sh \ - testfile-debug-rel-ppc64-g.o.bz2 \ - testfile-debug-rel-ppc64-z.o.bz2 \ -diff --git a/tests/Makefile.in b/tests/Makefile.in -index 258dd64..fe9641f 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -141,7 +141,7 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile$(EXEEXT) \ - run-get-files.sh run-get-lines.sh run-next-files.sh \ - run-next-lines.sh run-get-pubnames.sh run-get-aranges.sh \ - run-allfcts.sh run-show-abbrev.sh run-line2addr.sh \ -- hash$(EXEEXT) run-large-elf-file.sh newscn$(EXEEXT) \ -+ hash$(EXEEXT) newscn$(EXEEXT) \ - run-strip-test.sh run-strip-test2.sh run-strip-test3.sh \ - run-strip-test4.sh run-strip-test5.sh run-strip-test6.sh \ - run-strip-test7.sh run-strip-test8.sh run-strip-test9.sh \ -@@ -1423,7 +1423,6 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \ - testfile-riscv64-core.bz2 \ - run-reverse-sections.sh run-reverse-sections-self.sh \ - run-copyadd-sections.sh run-copymany-sections.sh \ -- run-large-elf-file.sh \ - run-typeiter-many.sh run-strip-test-many.sh \ - testfile-debug-rel-ppc64-g.o.bz2 \ - testfile-debug-rel-ppc64-z.o.bz2 \ -@@ -2581,13 +2580,6 @@ hash.log: hash$(EXEEXT) - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) --run-large-elf-file.sh.log: run-large-elf-file.sh -- @p='run-large-elf-file.sh'; \ -- b='run-large-elf-file.sh'; \ -- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -- --log-file $$b.log --trs-file $$b.trs \ -- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -- "$$tst" $(AM_TESTS_FD_REDIRECT) - newscn.log: newscn$(EXEEXT) - @p='newscn$(EXEEXT)'; \ - b='newscn'; \ --- -2.24.0 -