From 1f480d3c9f957573baeb4dc0c1681c351e9abd9d Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Wed, 13 Oct 2021 20:35:28 +0200 Subject: [PATCH] Fix gdb patch for cygwin compatibility gdbres.o has no C++ source. --- .../binutils-gdb/008-gdbtk-obj-in-subdir.patch | 16 ++++++++++++---- patches/binutils-gdb/009-link-gdb-objects.patch | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch b/patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch index 3b9f1b0..f681313 100644 --- a/patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch +++ b/patches/binutils-gdb/008-gdbtk-obj-in-subdir.patch @@ -2,8 +2,8 @@ - Keep gdbtk object files in their source directory. diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in ---- a/gdb/Makefile.in 2020-02-10 01:37:06.769236784 +0100 -+++ b/gdb/Makefile.in 2020-02-10 01:40:23.624305898 +0100 +--- a/gdb/Makefile.in 2021-10-13 19:55:33.948325927 +0200 ++++ b/gdb/Makefile.in 2021-10-13 19:58:24.700037475 +0200 @@ -541,15 +541,15 @@ GDBTK_LIBRARY = $(datadir)/insight$(GDBT GDBTK_SRC_DIR = @GDBTK_SRC_DIR@ @@ -51,7 +51,15 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in installcheck: -@@ -2525,10 +2523,10 @@ clean-gdbtk: +@@ -1855,6 +1853,7 @@ test-cp-name-parser$(EXEEXT): test-cp-na + + INIT_FILES_FILTER_OUT = \ + cp-name-parser.o \ ++ gdbres.o \ + init.o \ + version.o \ + xml-builtin.o \ +@@ -2525,10 +2524,10 @@ clean-gdbtk: rm -f insight$(EXEEXT) # Removing the old gdb first works better if it is running, at least on SunOS. @@ -64,7 +72,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico -@@ -2563,7 +2561,7 @@ endif +@@ -2563,7 +2562,7 @@ endif # A list of all the objects we might care about in this build, for # dependency tracking. diff --git a/patches/binutils-gdb/009-link-gdb-objects.patch b/patches/binutils-gdb/009-link-gdb-objects.patch index eb9331e..1b44132 100644 --- a/patches/binutils-gdb/009-link-gdb-objects.patch +++ b/patches/binutils-gdb/009-link-gdb-objects.patch @@ -4,7 +4,7 @@ diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in --- a/gdb/Makefile.in 2020-01-17 14:59:10.828447626 +0100 +++ b/gdb/Makefile.in 2020-01-17 15:04:17.577523482 +0100 -@@ -2523,10 +2523,10 @@ clean-gdbtk: +@@ -2524,10 +2524,10 @@ clean-gdbtk: rm -f insight$(EXEEXT) # Removing the old gdb first works better if it is running, at least on SunOS. -- 2.43.5