From nobody Fri Nov 18 16:10:21 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NDMFV1dtKz4hmYM; Fri, 18 Nov 2022 16:10:22 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NDMFV0yWRz41mn; Fri, 18 Nov 2022 16:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668787822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJxMCLB7p1CTSbi58YZL6+XXXUifi+UT/EryumiAH78=; b=UzznxHQnxhov3VSZ/l/lkTWua1RCGRVegqYGlWf2evDjvfxiDOyEeGPrgBbhbNs3MUd4xh M4unqnuiKopM38QxxN9WmiVuDQgILMXPu+VP3JQZeRktyyx8JCg7hjrNw5yI77udS0jtAc RkdJsIg7sJrz5LVRBQ9/CIsVIJJ6Qapo1ZfJ9rDRb9gTOAE+fvw+xWW9bL6awofqXR401M mwRu3L13C4QKhRTJlgW3Z/s0jAXk/J6qpNLeXka8Bg8kwNIh3EaM+rEYenpaba2wr5FDYr m97VwHvK7zHIE8xOHTCiAbO3Vwj/JuQSqRrbJnlo5AAM8xoxRJgbtymBVAEBLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668787822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJxMCLB7p1CTSbi58YZL6+XXXUifi+UT/EryumiAH78=; b=y42cCPJuwcdoc1ewYoThuIkYY+wb5H6KDzE/2KWwvAMHsNvRKXW/+IRp5IfKo7BijOed7J Gnu1bFz03+L5U4NoWCsu4c7FQVpqP7mHLBXv935ZTRkFysDXqSv19HnbJCXakTUWf0ls5b SVNeQX0yUYPvpyXkKSlG6my4mW8OyxjRMNrxUZ+ivHRDF6e9oY4fpbxGK35wF9yaNXXwVI pCxpudtRTHClX/eEjdI1oxYtXi8ooJyUj4eMmfKJBS7Tp/uwZ6fl+vHyNrenz/YhxWONni WJl9Zqj7IOLbkHw5QeWqGkBRfGGQLzjla/3T6TBpvX2slXedGscH6QGkRPCCMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668787822; a=rsa-sha256; cv=none; b=bfDU0llpaidpyHbV+Fqo5NMtQqnI+N5M8OzF0xuEbbcRSyhB6NyY6/acyyWZuepLPcPgsK y+RwhSvRH/zWJYL7Jn8anBPpOBuLcgyEgZtt5biL1ltyzB9peTu1GzxE66AteQ/2FL6+u6 8UGUnoUCBjnqb6++DDEYC0jn88prqSHluX8wR9ibFOktObz19CQhbFDuV/KYk2+uUPVHx2 1koRnxVNUTwrxnxHYyMJCzsps454SaHiUZpTTsc68XR5XAYRzlgVn3wFuE9Mcq73OYnosl 3Lrk6jTI+wdZjJ8FQyPEDjUeruct11We+EEzYfb81QKLeOkUia2bg2WMa7Fziw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NDMFT72YNz1R1b; Fri, 18 Nov 2022 16:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AIGAL9a039581; Fri, 18 Nov 2022 16:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIGALrj039580; Fri, 18 Nov 2022 16:10:21 GMT (envelope-from git) Date: Fri, 18 Nov 2022 16:10:21 GMT Message-Id: <202211181610.2AIGALrj039580@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 294875721ef0 - main - devel/gdb: make Expat and xxHash support optional (on by default) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294875721ef0eeb1c5b842c16ff6edfd8e98ebc7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=294875721ef0eeb1c5b842c16ff6edfd8e98ebc7 commit 294875721ef0eeb1c5b842c16ff6edfd8e98ebc7 Author: Alexey Dokuchaev AuthorDate: 2022-11-18 16:08:34 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-11-18 16:08:34 +0000 devel/gdb: make Expat and xxHash support optional (on by default) While Expat dependency was hardcoded, xxHash was not and could be silently picked up, resulting in the unregistered dependency. Allow users to explicitly disable both if desired. Remove DEBUG option (correct way to build debug packages is -DWITH_DEBUG) and adjust a couple of option descriptions. --- devel/gdb/Makefile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index f0e75d39eed5..d6d22324e0e5 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -27,7 +27,6 @@ CONFIGURE_ARGS= --program-suffix=${DISTVERSION:S/.//g} \ --enable-targets=all --enable-64-bit-bfd \ --with-separate-debug-dir=/usr/lib/debug \ ${ICONV_CONFIGURE_ARG} \ - --with-expat=yes --with-libexpat-prefix=${LOCALBASE} \ --without-libunwind-ia64 --with-system-zlib CONFIGURE_OUTSOURCE= yes CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes @@ -63,14 +62,14 @@ EXTRA_PATCHES= ${FILESDIR}/commit-711b0b6698f \ ${FILESDIR}/commit-f9fbb7636a5 \ ${FILESDIR}/commit-b7fe5463cf0 \ ${FILESDIR}/commit-b2fdd31b03e -LIB_DEPENDS+= libexpat.so:textproc/expat2 VER= ${DISTVERSION:S/.//g} PLIST_SUB= VER=${VER} -OPTIONS_DEFINE= DEBUG GDB_LINK GUILE KGDB NLS PYTHON SOURCE_HIGHLIGHT TUI - -OPTIONS_DEFAULT= GDB_LINK KGDB NLS PYTHON SOURCE_HIGHLIGHT TUI +OPTIONS_DEFINE= EXPAT GDB_LINK GUILE KGDB NLS PYTHON SOURCE_HIGHLIGHT \ + TUI XXHASH +OPTIONS_DEFAULT= EXPAT GDB_LINK KGDB NLS PYTHON SOURCE_HIGHLIGHT \ + TUI XXHASH OPTIONS_DEFAULT+= PORT_READLINE PORT_ICONV SYSTEM_ZLIB OPTIONS_SINGLE= READLINE ICONV ZLIB @@ -79,21 +78,22 @@ OPTIONS_SINGLE_ICONV= PORT_ICONV SYSTEM_ICONV OPTIONS_SINGLE_ZLIB= BUNDLED_ZLIB SYSTEM_ZLIB GDB_LINK_DESC= Create ${PREFIX}/bin/gdb symlink -KGDB_DESC= Kernel Debugging Support +KGDB_DESC= Kernel debugging support BUNDLED_READLINE_DESC= from gdb distfile BUNDLED_ZLIB_DESC= from gdb distfile PORT_READLINE_DESC= from devel/readline port PORT_ICONV_DESC= use libiconv, with wider charset support -SOURCE_HIGHLIGHT_DESC= Source Code Styling +SOURCE_HIGHLIGHT_DESC= Syntax highlighting support SYSTEM_ICONV_DESC= use libc iconv, with no wchar support SYSTEM_ZLIB_DESC= use system zlib -TUI_DESC= Text User Interface enabled +TUI_DESC= Text User Interface support +XXHASH_DESC= Use xxHash for hashing (faster) OPTIONS_SUB= yes BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline -DEBUG_CFLAGS= -g -DEBUG_VARS= STRIP= +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 @@ -108,6 +108,8 @@ SOURCE_HIGHLIGHT_LIB_DEPENDS= \ SYSTEM_ICONV_USES= iconv SYSTEM_ZLIB_WITH= system-zlib TUI_CONFIGURE_ENABLE= tui +XXHASH_CONFIGURE_OFF= --with-xxhash=no +XXHASH_LIB_DEPENDS= libxxhash.so:devel/xxhash .include