sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-20 14:03:59 +03:00
Code

build: Do not check if system perl modules should be bundled

Browse Source 
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:
Andrew Bartlett 2020-02-03 09:51:12 +13:00
parent 6be818b47b
commit cf4984947b
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pidl/wscript
View File

@ -6,23 +6,16 @@ from waflib import Logs, Errors
# This function checks if a perl module is installed on the system. # This function checks if a perl module is installed on the system.
def check_system_perl_module(conf, module, version=None): def check_system_perl_module(conf, module, version=None):
bundle_name = module.replace('::', '_')
module_check = module module_check = module
# Create module string with version # Create module string with version
if version: if version:
module_check = module + ' ' + str(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 # Check for system perl module
if conf.check_perl_module(module_check) is None: if conf.check_perl_module(module_check) is None:
return False return False
conf.define('USING_SYSTEM_%s' % bundle_name.upper(), 1)
return True return True
def options(opt): def options(opt):

2
script/autobuild.py
View File

@ -623,7 +623,7 @@ tasks = {
# retry with nonshared smbd and smbtorture # retry with nonshared smbd and smbtorture
("nonshared-distclean", "make distclean"), ("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") ("nonshared-make", "make -j")
], ],