Created attachment 252708 [details] SAMBALDBPORT patch version 1 Some ports like sssd2 depend on Samba and ldb. The version of ldb must match the one used by Samba. It makes sense to hardcode the ldb version in samba.mk. One of the ways to implement that is to set SAMBALDBPORT in samba.mk.
I am not sure about the naming convention in samba.mk. SAMBALDBPORT seems to be consistent with the convention imposed by SAMBAPORT, but it might make more sense to use SAMBA_LDB_PORT instead. Thoughts?
Comment on attachment 252708 [details] SAMBALDBPORT patch version 1 I've posted an updated patch to https://reviews.freebsd.org/D46322
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6c509342f4a065b30cf1afe0b2a8f67bd5a0401 commit b6c509342f4a065b30cf1afe0b2a8f67bd5a0401 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-08-19 19:56:05 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-08-21 17:00:46 +0000 Mk/Uses/samba.mk: Clean up and define SAMBA_LDB_PORT - Deprecate the SAMBAPORT, SAMBALIBS, and SAMBAINCLUDES variables and replace them with the more readable and consistent SAMBA_PORT, SAMBA_LIBDIR, and SAMBA_INCLUDEDIR. The new variables follow the conventions of python.mk, ruby.mk, and cargo.mk more and are more future-proof. - Rearrange the order of IGNORE checks. - Explicitly mention the ports used samba.mk in a searchable manner (i.e., grepping for net/samba419 is going to return samba.mk). - Define SAMBA_LDB_PORT, which allows ports to always use the right version of ldb for the Samba selected via SAMBA_DEFAULT. - Remove old comments about samba.mk becoming more granular once subpackages are committed. Subpackages will not help samba.mk because Samba's bundled dependencies are built as private libraries and are not usable by external software. PR: 280773 Reviewed by: Xavier Beaudouin <kiwi@oav.net> Approved by: samba (0mp, Xavier Beaudouin <kiwi@oav.net>) Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D46322 Mk/Uses/samba.mk | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-)