From owner-svn-ports-head@freebsd.org Fri Mar 13 09:12:43 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 02B48258CB1; Fri, 13 Mar 2020 09:12:43 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f0Mt4Zy4z3JN4; Fri, 13 Mar 2020 09:12:42 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F7F93D3E; Fri, 13 Mar 2020 09:12:42 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02D9CgQi027881; Fri, 13 Mar 2020 09:12:42 GMT (envelope-from pizzamig@FreeBSD.org) Received: (from pizzamig@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D9Cgha027879; Fri, 13 Mar 2020 09:12:42 GMT (envelope-from pizzamig@FreeBSD.org) Message-Id: <202003130912.02D9Cgha027879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pizzamig set sender to pizzamig@FreeBSD.org using -f From: Luca Pizzamiglio Date: Fri, 13 Mar 2020 09:12:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528338 - in head/devel/gdb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pizzamig X-SVN-Commit-Paths: in head/devel/gdb: . files X-SVN-Commit-Revision: 528338 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 09:12:43 -0000 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 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; +}