From: Andrew Bartlett Date: Sun, 2 Feb 2020 20:51:12 +0000 (+1300) Subject: build: Do not check if system perl modules should be bundled X-Git-Tag: ldb-2.1.1~206 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf4984947b39e9f6f8afd29de8a760703bf9e092;p=thirdparty%2Fsamba.git 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 Reviewed-by: Gary Lockyer --- diff --git a/pidl/wscript b/pidl/wscript index 88cb9132fd6..50fe12c013d 100644 --- a/pidl/wscript +++ b/pidl/wscript @@ -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): diff --git a/script/autobuild.py b/script/autobuild.py index 2a0b7da53e5..f5cf2a85ca0 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -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") ],