From nobody Mon Dec 15 13:46:06 2025 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 4dVLtk6SMJz6KkLv for ; Mon, 15 Dec 2025 13:46:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVLtk43Ljz3Dy8 for ; Mon, 15 Dec 2025 13:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765806366; 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=giUl1kc/bTQd6Q/v+3oasNqZD+vijrMiVN6ub5DnJQM=; b=U892zoN58CZTHOXqQK+7cSVDfLVqPWNw1FHmFu5gZM1mvDNHkMRRh2Sq0+3E6qN6E6dUdQ TD8eNR4F9REI+wv05cl1WJj/9hNo51rTRsz7LDkAqJeMdjiEtld8CeYAfJqNqjBPOl4Zv2 7UIt1yPxTuI916T3iLSzBkGoD127ve4CGHgTqd9xjXv+ep8Zu2K5TANScxnYQFe+HSXSSN PXuLo3T/f7ChESh/xhdx89eWU0YS+hHwKc8eSgCkbaKnfetUzrUElpROJ1a5VCuLCNgVmZ thNQCVKWtw5u+MKFCYSYMegefetyN4ioL3d1GdpXFBVAm2e6LWA9i/k4xYqbSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765806366; 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=giUl1kc/bTQd6Q/v+3oasNqZD+vijrMiVN6ub5DnJQM=; b=w7cvDtF4ufJHCI9ZEjPLMwVg0mBL/woTwuYXBux6aGEc9IAix7OtA/7AgqKrqStRk/lo3j fScosBHdxE7eAts9tQ1hVGrFoBvaAQxyuwIrlTj+sVQ3oWw/slBBrRYJAvz87wuhkZL10M 98k4bVw3FPDgOcTgi2JeRLcgnwpY+aOZZ7FbPpCHO1M8MQac5neDpC1IrURwaO/vMaELw2 jwslzVChYP/s+/fe+Y72bVIlGrv5WOpRUfQ1Wn1dfjXgrGdccqdAIDkl40TcOGqfLrd1gc FDrmbwq+bpV9wQDUyl71gHCnQjv7ur0iMnMwEcgvFNeR0TpwgKtaVj06TuTLAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765806366; a=rsa-sha256; cv=none; b=RdCLbotRgtvMMQYmXBLlCrGed9vG1RM8mxmg1WtLtud/DeWsiYe4oC4Vn41OfCsCeMZjLk LoWOYS2tkb9JlVBK1nsvvXc7V+jCsOkHRtkn6NX5RPk+ipGWKVAjdbyWEddz+BTEkHloB0 c1GKfMJQIrwTaDROgDG+D5n2S85uRzgTRL2SqFWoXkZm2mL+yvlonTWtEjaWdSH1TteLaX CZOMrwUstaxSZ9SEzOraltxByEtp99cLMJhUxCN4aZlRDhvQJLIRPfRFW540Ma2n2583WG f89H+dG+Fnf676z8AfMtOOYYNudY44WQ95UncSD9i/IQb1yEXP8jumzsE6WrIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVLtk3LfDz6Yl for ; Mon, 15 Dec 2025 13:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33821 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 13:46:06 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 798d67a22558 - main - net/samba422: Refactor handling of SAMBA4_PRIVATE_LIBS, SAMBA4_BUNDLED_LIBS, and SAMBA4_MODULES 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 798d67a22558987fcd59fe35a8c99fc90381e56e Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 13:46:06 +0000 Message-Id: <6940111e.33821.4d80670c@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=798d67a22558987fcd59fe35a8c99fc90381e56e commit 798d67a22558987fcd59fe35a8c99fc90381e56e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-12-12 14:25:41 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-12-15 13:44:38 +0000 net/samba422: Refactor handling of SAMBA4_PRIVATE_LIBS, SAMBA4_BUNDLED_LIBS, and SAMBA4_MODULES --- net/samba422/Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/net/samba422/Makefile b/net/samba422/Makefile index d0ec21a39c8f..4918dbd5fa6b 100644 --- a/net/samba422/Makefile +++ b/net/samba422/Makefile @@ -129,6 +129,9 @@ CONFIGURE_ARGS+= \ --with-sendfile-support \ --disable-ctdb-tests \ --disable-spotlight +CONFIGURE_ARGS+= ${SAMBA4_PRIVATE_LIBS:D--private-libraries="${SAMBA4_PRIVATE_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"} +CONFIGURE_ARGS+= ${SAMBA4_BUNDLED_LIBS:D--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"} +CONFIGURE_ARGS+= ${SAMBA4_MODULES:D--with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}"} CONFIGURE_ENV= PTHREAD_LDFLAGS="-lpthread" \ PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1 \ @@ -448,17 +451,6 @@ SAMBA4_MODULES+= vfs_acl_tdb vfs_acl_xattr vfs_aio_fork vfs_aio_pthread \ SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif -.if defined(SAMBA4_PRIVATE_LIBS) && !empty(SAMBA4_PRIVATE_LIBS) -CONFIGURE_ARGS+= --private-libraries="${SAMBA4_PRIVATE_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" -.endif - -.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) -CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" -.endif - -.if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) -CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}" -.endif # XXX: Hack for nss-info_* -> nss_info/* modules # Add selected modules to the plist .for module in ${SAMBA4_MODULES}