From 6476e0cf02302f581a4309ffb56c6e0d7ad47dde Mon Sep 17 00:00:00 2001
From: Robert Underwood <robertu94@users.noreply.github.com>
Date: Mon, 20 Sep 2021 07:30:37 -0400
Subject: gdb: new version v11.1 (#25920)

---
 var/spack/repos/builtin/packages/gdb/gdb-libintl-10.patch | 12 ++++++++++++
 var/spack/repos/builtin/packages/gdb/gdb-libintl-11.patch | 12 ++++++++++++
 var/spack/repos/builtin/packages/gdb/gdb-libintl.patch    | 12 ------------
 var/spack/repos/builtin/packages/gdb/package.py           |  4 +++-
 4 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/gdb/gdb-libintl-10.patch
 create mode 100644 var/spack/repos/builtin/packages/gdb/gdb-libintl-11.patch
 delete mode 100644 var/spack/repos/builtin/packages/gdb/gdb-libintl.patch

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/gdb/gdb-libintl-10.patch b/var/spack/repos/builtin/packages/gdb/gdb-libintl-10.patch
new file mode 100644
index 0000000000..5d990d6305
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gdb/gdb-libintl-10.patch
@@ -0,0 +1,12 @@
+diff -Naur gdbserver/Makefile.in gdbserver/Makefile.in
+--- gdbserver/Makefile.in	2020-10-24 06:23:02.000000000 +0200
++++ gdbserver/Makefile.in	2021-02-15 13:41:31.732000000 +0100
+@@ -388,7 +388,7 @@
+ 	$(SILENCE) rm -f $(IPA_LIB)
+ 	$(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \
+ 		-Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
+-		-o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread
++		-o $(IPA_LIB) ${IPA_OBJS} $(INTL) -ldl -pthread
+ 
+ # Put the proper machine-specific files first, so M-. on a machine
+ # specific routine gets the one for the correct machine.
diff --git a/var/spack/repos/builtin/packages/gdb/gdb-libintl-11.patch b/var/spack/repos/builtin/packages/gdb/gdb-libintl-11.patch
new file mode 100644
index 0000000000..0354dd6cc0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gdb/gdb-libintl-11.patch
@@ -0,0 +1,12 @@
+diff -Naur gdbserver/Makefile.in gdbserver/Makefile.in
+--- gdbserver/Makefile.in	2021-07-03 13:41:11.000000000 -0400
++++ gdbserver/Makefile.in	2021-09-13 14:53:13.402962333 -0400
+@@ -404,7 +404,7 @@
+ 	$(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \
+ 		-Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
+ 		 $(CXXFLAGS) \
+-		-o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread
++		-o $(IPA_LIB) ${IPA_OBJS} $(INTL) $(LIBIBERTY_FOR_SHLIB) -ldl -pthread
+ 
+ # Put the proper machine-specific files first, so M-. on a machine
+ # specific routine gets the one for the correct machine.
diff --git a/var/spack/repos/builtin/packages/gdb/gdb-libintl.patch b/var/spack/repos/builtin/packages/gdb/gdb-libintl.patch
deleted file mode 100644
index 5d990d6305..0000000000
--- a/var/spack/repos/builtin/packages/gdb/gdb-libintl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gdbserver/Makefile.in gdbserver/Makefile.in
---- gdbserver/Makefile.in	2020-10-24 06:23:02.000000000 +0200
-+++ gdbserver/Makefile.in	2021-02-15 13:41:31.732000000 +0100
-@@ -388,7 +388,7 @@
- 	$(SILENCE) rm -f $(IPA_LIB)
- 	$(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \
- 		-Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
--		-o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread
-+		-o $(IPA_LIB) ${IPA_OBJS} $(INTL) -ldl -pthread
- 
- # Put the proper machine-specific files first, so M-. on a machine
- # specific routine gets the one for the correct machine.
diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py
index ee40c6ce8a..7ef2f870cd 100644
--- a/var/spack/repos/builtin/packages/gdb/package.py
+++ b/var/spack/repos/builtin/packages/gdb/package.py
@@ -19,6 +19,7 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage):
 
     maintainers = ['robertu94']
 
+    version('11.1', sha256='cc2903474e965a43d09c3b263952d48ced39dd22ce2d01968f3aa181335fcb9c')
     version('10.2',   sha256='b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350')
     version('10.1',   sha256='f12f388b99e1408c01308c3f753313fafa45517740c81ab7ed0d511b13e2cf55')
     version('9.2',    sha256='38ef247d41ba7cc3f6f93a612a78bab9484de9accecbe3b0150a3c0391a3faf0')
@@ -49,7 +50,8 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage):
 
     # Resolves the undefined references to libintl_gettext while linking gdbserver
     # https://www.gnu.org/software/gettext/FAQ.html#integrating_undefined
-    patch('gdb-libintl.patch', level=0, when='@10.1:')
+    patch('gdb-libintl-10.patch', level=0, when='@10.1:11.0')
+    patch('gdb-libintl-11.patch', level=0, when='@11.1:')
 
     # Silence warnings about imp being deprecated on new python versions
     # https://sourceware.org/pipermail/gdb-patches/2021-February/176622.html
-- 
cgit v1.2.3-60-g2f50