Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Aug 2024 19:44:28 GMT
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e75af545d1d1 - main - net/samba419: Use external dependencies by default
Message-ID:  <202408161944.47GJiS6k003205@gitrepo.freebsd.org>

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

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

commit e75af545d1d1c258ce8135c422d62f35235ee0fc
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2024-08-16 19:34:41 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2024-08-16 19:44:10 +0000

    net/samba419: Use external dependencies by default
    
    The Samba package can be built with the following dependencies bundled
    in: cmocka, talloc, tevent, tdb, and ldb. This is a handy way of getting
    the right versions of all those dependencies. Unfortunately, the bundled
    dependencies conflict with their packaged counterparts, which leads to
    the build and installation issues with packages like security/sssd2 and
    net/freeradius3. Building Samba without the bundled dependencies
    resolves those issues, so let's do that.
    
    PR:             280557
    Approved by:    samba (mikael, 0mp)
    Sponsored by:   Klara, Inc.
---
 net/samba419/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/samba419/Makefile b/net/samba419/Makefile
index e78102f165da..cb3c2130c797 100644
--- a/net/samba419/Makefile
+++ b/net/samba419/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=			${SAMBA4_BASENAME}419
 PORTVERSION=			${SAMBA4_VERSION}
+PORTREVISION=			1
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -191,11 +192,11 @@ BUILD_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
 RUN_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
 
 ### Bundled libraries
-SAMBA4_BUNDLED_CMOCKA?=		yes
-SAMBA4_BUNDLED_TALLOC?=		yes
-SAMBA4_BUNDLED_TEVENT?=		yes
-SAMBA4_BUNDLED_TDB?=		yes
-SAMBA4_BUNDLED_LDB?=		yes
+SAMBA4_BUNDLED_CMOCKA?=		no
+SAMBA4_BUNDLED_TALLOC?=		no
+SAMBA4_BUNDLED_TEVENT?=		no
+SAMBA4_BUNDLED_TDB?=		no
+SAMBA4_BUNDLED_LDB?=		no
 # cmocka
 .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
 SAMBA4_BUNDLED_LIBS+=		cmocka



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