mirror of
https://github.com/samba-team/samba.git
synced 2025-01-03 01:18:10 +03:00
build: Do not check if system perl modules should be bundled
We do not ship any perl modules in third_party at this time, so this check is pointless and breaks the build for --bundled-libraries=ALL. As reported by aaptel on https://gitlab.com/samba-team/samba/-/merge_requests/1104#note_281050331 This changes our autobuild script to cover this case in the samba-static job. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
parent
6be818b47b
commit
cf4984947b
@ -6,23 +6,16 @@ from waflib import Logs, Errors
|
||||
|
||||
# This function checks if a perl module is installed on the system.
|
||||
def check_system_perl_module(conf, module, version=None):
|
||||
bundle_name = module.replace('::', '_')
|
||||
module_check = module
|
||||
|
||||
# Create module string with version
|
||||
if version:
|
||||
module_check = module + ' ' + str(version)
|
||||
|
||||
# Check if we have to bundle it.
|
||||
if conf.LIB_MUST_BE_BUNDLED(bundle_name.lower()):
|
||||
return False
|
||||
|
||||
# Check for system perl module
|
||||
if conf.check_perl_module(module_check) is None:
|
||||
return False
|
||||
|
||||
conf.define('USING_SYSTEM_%s' % bundle_name.upper(), 1)
|
||||
|
||||
return True
|
||||
|
||||
def options(opt):
|
||||
|
@ -623,7 +623,7 @@ tasks = {
|
||||
|
||||
# retry with nonshared smbd and smbtorture
|
||||
("nonshared-distclean", "make distclean"),
|
||||
("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=talloc,tdb,pytdb,ldb,pyldb,tevent,pytevent --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd"),
|
||||
("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd"),
|
||||
("nonshared-make", "make -j")
|
||||
],
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user