diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2020-02-03 09:51:12 +1300 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-02-20 12:58:45 +0000 |
| commit | 537acf2a185c7b8ee76c7a55cb9d9dad6417d153 (patch) | |
| tree | 44448f72b595e29a776dbe156f407e83925e16c6 | |
| parent | da44630885eb51f54c4814dcac1c94f11a149642 (diff) | |
| download | samba-537acf2a185c7b8ee76c7a55cb9d9dad6417d153.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.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14284
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
(cherry picked from commit cf4984947b39e9f6f8afd29de8a760703bf9e092)
Autobuild-User(v4-12-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-12-test): Thu Feb 20 12:58:46 UTC 2020 on sn-devel-184
| -rw-r--r-- | pidl/wscript | 7 | ||||
| -rwxr-xr-x | script/autobuild.py | 2 |
2 files changed, 1 insertions, 8 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): 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") ], |