svn commit: r528338 - in head/devel/gdb: . files

[Luca Pizzamiglio]

Author: pizzamig
Date: Fri Mar 13 09:12:41 2020
New Revision: 528338
URL: https://svnweb.freebsd.org/changeset/ports/528338

Log:
  devel/gdb: fix build with BUILE option enabled
  
  PR:		244760
  Reported by:	Ting-Wei Lan <lantw44 at gmail.com>

Modified:
  head/devel/gdb/Makefile
  head/devel/gdb/files/extrapatch-guile22

Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile	Fri Mar 13 08:50:07 2020	(r528337)
+++ head/devel/gdb/Makefile	Fri Mar 13 09:12:41 2020	(r528338)
@@ -70,7 +70,6 @@ OPTIONS_SUB=	yes
 BUNDLED_READLINE_CONFIGURE_OFF=	--with-system-readline
 DEBUG_CFLAGS=		-g
 GUILE_CONFIGURE_WITH=	guile
-GUILE_USES=		pkgconfig
 GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 GUILE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-guile22
 NLS_USES=	gettext-runtime

Modified: head/devel/gdb/files/extrapatch-guile22
==============================================================================
--- head/devel/gdb/files/extrapatch-guile22	Fri Mar 13 08:50:07 2020	(r528337)
+++ head/devel/gdb/files/extrapatch-guile22	Fri Mar 13 09:12:41 2020	(r528338)
@@ -175,7 +175,7 @@
  

  /* Support for connecting Guile's stdio ports to GDB's stdio ports.  */
  
-@@ -218,6 +262,73 @@ ioscm_input_waiting (SCM port)
+@@ -218,6 +262,72 @@ ioscm_input_waiting (SCM port)
    }
  }
  
@@ -228,18 +228,17 @@
 +      scm_syserror("ioscm_write");
 +    }
 +
-+  TRY
++  try
 +    {
 +      if (scm_is_eq (port, error_port_scm))
 +	fputsn_filtered (ptr, count, gdb_stderr);
 +      else
 +	fputsn_filtered (ptr, count, gdb_stdout);
 +    }
-+  CATCH (except, RETURN_MASK_ALL)
++  catch (gdbscm_gdb_exception &except)
 +    {
 +      GDBSCM_HANDLE_GDB_EXCEPTION (except);
 +    }
-+  END_CATCH
 +
 +  return count;
 +}