[FYI/gdb-13-branch] Ensure that libbacktrace/allocfail.sh is not deleted when creating release tarballs.

Message ID 20230202045755.572927-1-brobecker@adacore.com
State New
Headers
Series [FYI/gdb-13-branch] Ensure that libbacktrace/allocfail.sh is not deleted when creating release tarballs. |

Commit Message

Joel Brobecker Feb. 2, 2023, 4:57 a.m. UTC
  Hello,

Just a quick email to let everyone know that I have backported
to the gdb-13-branch the following commmit that Nick Clifton
pushed recently on master.

This commit is important for the gdb-13 release, because doing
a "make distclean", which depends on "make clean" is part of
the process for producing the source package. Without this patch,
I found that one checked-in file (libbacktrace/allocafail.sh)
was unexpectedly missing from the source package.


        * Makefile.am (CLEANFILES): Import patch from upstream to prevent
        allocafail.sh from being removed when running 'make clean'.

(cherry picked from commit edf64cd235f5ecb3725e7cf1ff83bbdb6dd53340)

Thank you,
  

Patch

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 983f81672fb..14df45e7072 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@ 
+2023-01-12  Nick Clifton  <nickc@redhat.com>
+
+	* Makefile.am (CLEANFILES): Import patch from upstream to prevent
+	allocafail.sh from being removed when running 'make clean'.
+
 2021-11-12  Martin Liska  <mliska@suse.cz>
 
 	PR libbacktrace/103167
diff --git a/libbacktrace/Makefile.am b/libbacktrace/Makefile.am
index bf9d30a382c..e4f34b5fbd7 100644
--- a/libbacktrace/Makefile.am
+++ b/libbacktrace/Makefile.am
@@ -539,7 +539,7 @@  check_PROGRAMS += $(BUILDTESTS)
 TESTS += $(BUILDTESTS)
 
 CLEANFILES = \
-	$(TESTS) *.debug elf_for_test.c edtest2_build.c gen_edtest2_build \
+       $(filter-out allocfail.sh,$(TESTS)) *.debug elf_for_test.c edtest2_build.c gen_edtest2_build \
 	*.dsyms *.fsyms *.keepsyms *.dbg *.mdbg *.mdbg.xz *.strip
 
 clean-local:
diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
index 5167ca80ad1..0a61880ba67 100644
--- a/libbacktrace/Makefile.in
+++ b/libbacktrace/Makefile.in
@@ -1130,7 +1130,7 @@  libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g
 @HAVE_ELF_TRUE@xztest_alloc_LDADD = libbacktrace_alloc.la \
 @HAVE_ELF_TRUE@	$(am__append_28) $(CLOCK_GETTIME_LINK)
 CLEANFILES = \
-	$(TESTS) *.debug elf_for_test.c edtest2_build.c gen_edtest2_build \
+       $(filter-out allocfail.sh,$(TESTS)) *.debug elf_for_test.c edtest2_build.c gen_edtest2_build \
 	*.dsyms *.fsyms *.keepsyms *.dbg *.mdbg *.mdbg.xz *.strip