diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2020-02-03 09:51:12 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2020-02-04 05:13:39 +0000 |
| commit | cf4984947b39e9f6f8afd29de8a760703bf9e092 (patch) | |
| tree | 5ac13149ba73cf9ddd4f76b35e28ac469efc5e4b /pidl | |
| parent | 6be818b47b934449d4a40973e4b81654ee22490b (diff) | |
| download | samba-cf4984947b39e9f6f8afd29de8a760703bf9e092.tar.gz | |
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>
Diffstat (limited to 'pidl')
| -rw-r--r-- | pidl/wscript | 7 |
1 files changed, 0 insertions, 7 deletions
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): |