Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Mar 2023 23:48:27 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c9df03d6fcf9 - main - devel/gdb: Remove the EXPAT option.
Message-ID:  <202303172348.32HNmR6d080775@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c9df03d6fcf987b5ccbfa7f34de2be7b3e49c380

commit c9df03d6fcf987b5ccbfa7f34de2be7b3e49c380
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-03-17 23:48:03 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-03-17 23:48:03 +0000

    devel/gdb: Remove the EXPAT option.
    
    GDB on FreeBSD requires libxml for full funtionality (e.g. 'catch
    syscall <syscall name>' parses the XML files installed in
    LOCALBASE/share that were still installed even when this option was
    disabled).  Also, using GDB with a debug server that returns any
    non-simple registers requires XML support for parsing the target
    description returned by the server (e.g. examining SSE or later
    registers or any system registers when attached to QEMU or
    lldb-server).
    
    Reviewed by:    pizzamig (maintainer), danfe
    Differential Revision:  https://reviews.freebsd.org/D38760
---
 devel/gdb/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index ca2c66b41fc4..e5ab6cdf7409 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -10,7 +10,8 @@ WWW=		https://www.gnu.org/software/gdb/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING3
 
-LIB_DEPENDS=	libgmp.so:math/gmp \
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libzstd.so:archivers/zstd
 TEST_DEPENDS=	runtest:misc/dejagnu
@@ -38,9 +39,9 @@ EXTRA_PATCHES=	${FILESDIR}/commit-a980a7d24b9
 VER=		${DISTVERSION:S/.//g}
 PLIST_SUB=	VER=${VER}
 
-OPTIONS_DEFINE=	EXPAT GDB_LINK GUILE KGDB NLS PYTHON SOURCE_HIGHLIGHT \
+OPTIONS_DEFINE=	GDB_LINK GUILE KGDB NLS PYTHON SOURCE_HIGHLIGHT \
 		TUI XXHASH
-OPTIONS_DEFAULT=	EXPAT GDB_LINK KGDB NLS PYTHON SOURCE_HIGHLIGHT \
+OPTIONS_DEFAULT=	GDB_LINK KGDB NLS PYTHON SOURCE_HIGHLIGHT \
 			TUI XXHASH
 OPTIONS_DEFAULT+=	PORT_READLINE PORT_ICONV SYSTEM_ZLIB
 
@@ -64,8 +65,6 @@ XXHASH_DESC=		Use xxHash for hashing (faster)
 OPTIONS_SUB=	yes
 
 BUNDLED_READLINE_CONFIGURE_OFF=	--with-system-readline
-EXPAT_CONFIGURE_OFF=	--with-expat=no
-EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 GUILE_CONFIGURE_WITH=	guile
 GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 NLS_USES=	gettext-runtime



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303172348.32HNmR6d080775>