gdb: Update to 13.2

Update the devel/gdb package to version 13.2 * Remove the upstreamed patch 001-Add-support-for-readline-8.2.patch * Adjust 130-gdb-ctrl-c.patch to upstream changes Signed-off-by: Hannu Nyman <[email protected]>
lede-project · Nov 10, 2023 · f79de8e · f79de8e
1 parent a7a94bc
commit f79de8e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 46 deletions.
diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gdb
-PKG_VERSION:=12.1
-PKG_RELEASE:=3
+PKG_VERSION:=13.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gdb
-PKG_HASH:=0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed
+PKG_HASH:=fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

diff --git a/package/devel/gdb/patches/001-Add-support-for-readline-8.2.patch b/package/devel/gdb/patches/001-Add-support-for-readline-8.2.patch
diff --git a/package/devel/gdb/patches/110-shared_libgcc.patch b/package/devel/gdb/patches/110-shared_libgcc.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1314,13 +1314,13 @@ if test -z "$LD"; then
+@@ -1435,13 +1435,13 @@ if test -z "$LD"; then
    fi
  fi
 
@@ -17,7 +17,7 @@
    AC_LANG_PUSH(C++)
    AC_LINK_IFELSE([AC_LANG_SOURCE([
  #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
-@@ -1719,7 +1719,7 @@ AC_ARG_WITH(stage1-ldflags,
+@@ -1838,7 +1838,7 @@ AC_ARG_WITH(stage1-ldflags,
   # trust that they are doing what they want.
   if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
       -a "$have_static_libs" = yes; then
@@ -26,7 +26,7 @@
   fi])
  AC_SUBST(stage1_ldflags)
 
-@@ -1748,7 +1748,7 @@ AC_ARG_WITH(boot-ldflags,
+@@ -1867,7 +1867,7 @@ AC_ARG_WITH(boot-ldflags,
   # statically.  But if the user explicitly specified the libraries to
   # use, trust that they are doing what they want.
   if test "$poststage1_libs" = ""; then
@@ -37,7 +37,7 @@
 
 --- a/configure
 +++ b/configure
-@@ -5275,14 +5275,14 @@ if test -z "$LD"; then
+@@ -5442,14 +5442,14 @@ if test -z "$LD"; then
    fi
  fi
 
@@ -56,7 +56,7 @@
    ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6167,7 +6167,7 @@ else
+@@ -8440,7 +8440,7 @@ else
   # trust that they are doing what they want.
   if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
       -a "$have_static_libs" = yes; then
@@ -65,7 +65,7 @@
   fi
  fi
 
-@@ -6203,7 +6203,7 @@ else
+@@ -8476,7 +8476,7 @@ else
   # statically.  But if the user explicitly specified the libraries to
   # use, trust that they are doing what they want.
   if test "$poststage1_libs" = ""; then

diff --git a/package/devel/gdb/patches/130-gdb-ctrl-c.patch b/package/devel/gdb/patches/130-gdb-ctrl-c.patch
@@ -24,12 +24,12 @@ Signed-off-by: Khem Raj <[email protected]>
 
 --- a/gdbserver/linux-low.cc
 +++ b/gdbserver/linux-low.cc
-@@ -5496,7 +5496,7 @@ linux_process_target::request_interrupt
+@@ -5467,7 +5467,7 @@ linux_process_target::request_interrupt
  {
    /* Send a SIGINT to the process group.  This acts just like the user
       typed a ^C on the controlling terminal.  */
--  ::kill (-signal_pid, SIGINT);
-+  ::kill (signal_pid, SIGINT);
- }
-
- bool
+-  int res = ::kill (-signal_pid, SIGINT);
++  int res = ::kill (signal_pid, SIGINT);
+   if (res == -1)
+     warning (_("Sending SIGINT to process group of pid %ld failed: %s"),
+ 	     signal_pid, safe_strerror (errno));