mirror of
https://git.freebsd.org/ports.git
synced 2025-04-30 18:46:38 -04:00
ed9df2d08f
This picks up an idea from PR 235207 again, where NTLM authentication is optional. Previous commits made samba a build-dependency so that the --enable-ntlm option would work. The meson build -- even though the dep is entirely runtime -- would check for the presence of ntlm_auth at build-time, to be able to pass in the path to ntlm_auth to the build. Re-jig this to not do the check, accept the option as-is, and use a likely path to ntlm_auth instead (which is what the original patch in 235207 did). A circular dependency from samba41[23] -> libsoup and back can be triggered by setting option SMB in libsoup and option SPOTLIGHT in samba. Originally the runtime dependency was registered as USES= samba:run A _RUN dependency still wants to build, though, and package and index builds failed. Cut the circular dependency by **not** registering samba as a runtime dependency and using a pkg-message to tell users to possibly install samba. Anyone who now has "but my samba is installed in a different prefix" can file a PR with a patch fixing meson better. PR: 256076 Reported by: Dimitry Andric
17 lines
649 B
Text
17 lines
649 B
Text
--- meson.build.orig 2021-06-12 13:43:16 UTC
|
|
+++ meson.build
|
|
@@ -340,11 +340,11 @@ endif
|
|
################
|
|
# NTLM not supported on Windows
|
|
if host_machine.system() != 'windows'
|
|
- ntlm_auth = find_program(get_option('ntlm_auth'), required: get_option('ntlm'))
|
|
+ # ntlm_auth = find_program(get_option('ntlm_auth'), required: get_option('ntlm'))
|
|
|
|
- if ntlm_auth.found()
|
|
+ if get_option('ntlm').enabled()
|
|
add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c')
|
|
- add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c')
|
|
+ add_project_arguments('-DNTLM_AUTH="@@NTLM_AUTH@@"', language : 'c')
|
|
endif
|
|
endif
|
|
|