diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2022-11-03 17:35:35 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2022-11-08 02:39:37 +0000 |
| commit | a3ee0ce255c7acb7abf58e70b75025b5fefdb275 (patch) | |
| tree | bc32bfe2bc01ffc0129d35807f5da8b9deefe5bc /wscript_build_system_heimdal | |
| parent | 77bb72d67204b58d0ae7a183e2a8988597faf15c (diff) | |
| download | samba-a3ee0ce255c7acb7abf58e70b75025b5fefdb275.tar.gz | |
wscript: Correctly determine dependencies for system Heimdal build
Previously, the call to CHECK_BUNDLED_SYSTEM() in
check_system_heimdal_lib() could have us pick up MIT Kerberos headers
when we should only be using system Heimdal headers. Now, we just
perform an explicit check for the functions we require, which should
avoid any use of the MIT libraries.
We also remove some library checks for Heimdal components that we don't
use directly, restricting the checks to only the functions we need.
Finally, we no longer need to recurse into third_party/heimdal_build
when performing a system Heimdal build.
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'wscript_build_system_heimdal')
| -rw-r--r-- | wscript_build_system_heimdal | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wscript_build_system_heimdal b/wscript_build_system_heimdal index 1fc738ea69c..16ed3ed9ed8 100644 --- a/wscript_build_system_heimdal +++ b/wscript_build_system_heimdal @@ -1,4 +1,10 @@ from waflib import Logs Logs.info("\tSelected system Heimdal build") -bld.RECURSE('third_party/heimdal_build') + +# Alias subsystem to allow common kerberos code that will +# otherwise link against MIT's gssapi_krb5 and k5crypto +# +# Note: that we also need this if we use system heimdal libraries +bld.SAMBA_SUBSYSTEM('gssapi_krb5', '', deps='gssapi') +bld.SAMBA_SUBSYSTEM('k5crypto', '', deps='krb5') |