diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2025-12-12 15:25:41 +0100 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2025-12-15 14:44:38 +0100 |
| commit | 798d67a22558987fcd59fe35a8c99fc90381e56e (patch) | |
| tree | 2a4c131a281b52185b913a281f412503a5fcd2f1 | |
| parent | net/samba422: Simplify handling of SAMBA4_BUNDLED_* (diff) | |
net/samba422: Refactor handling of SAMBA4_PRIVATE_LIBS, SAMBA4_BUNDLED_LIBS, and SAMBA4_MODULES
| -rw-r--r-- | net/samba422/Makefile | 14 |
1 files 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} |