The Samba-Bugzilla – Attachment 15800 Details for
Bug 14284
4.12 pidl configure should insist on Parse::Yapp::Driver
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch including "build: Do not check if system perl modules should be bundled"
pidl-deps.patch (text/plain), 4.22 KB, created by
Douglas Bagnall
on 2020-02-19 20:59:05 UTC
(
hide
)
Description:
patch including "build: Do not check if system perl modules should be bundled"
Filename:
MIME Type:
Creator:
Douglas Bagnall
Created:
2020-02-19 20:59:05 UTC
Size:
4.22 KB
patch
obsolete
>From 7bda1c95f5ace75f25b0f83fe03e1932a1d4e692 Mon Sep 17 00:00:00 2001 >From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> >Date: Sun, 2 Feb 2020 16:05:38 +1300 >Subject: [PATCH 1/2] pidl/wscript: configure should insist on > Parse::Yapp::Driver > >following 83ffe6752d589180eac96d7b8e7d1a54e3476bfd, you get a build >error if you lack a system perl Parse::Yapp. Let's make it a configure >failure instead. > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=14284 > >Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> >Reviewed-by: Andrew Bartlett <abartlet@samba.org> > >Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> >Autobuild-Date(master): Sun Feb 2 10:09:11 UTC 2020 on sn-devel-184 > >(cherry picked from commit af47a77673f58cc6436798b250c90be0e325d20e) >--- > pidl/wscript | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > >diff --git a/pidl/wscript b/pidl/wscript >index d1b8278990a..88cb9132fd6 100644 >--- a/pidl/wscript >+++ b/pidl/wscript >@@ -2,7 +2,7 @@ > > import os, string > from samba_utils import MODE_755 >-from waflib import Logs >+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): >@@ -30,10 +30,14 @@ def options(opt): > > def configure(conf): > # Check if perl(Parse::Yapp::Driver) is available. >- check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05) >+ if not check_system_perl_module(conf, >+ "Parse::Yapp::Driver", >+ 1.05): >+ raise Errors.WafError('perl module "Parse::Yapp::Driver" not found') > > # yapp is used for building the parser >- conf.find_program('yapp', var='YAPP') >+ if not conf.find_program('yapp', var='YAPP'): >+ raise Errors.WafError('yapp not found') > > def build(bld): > >-- >2.20.1 > > >From 9ddfe940b1d28c5dcfbc9c9be110eadb3117ba90 Mon Sep 17 00:00:00 2001 >From: Andrew Bartlett <abartlet@samba.org> >Date: Mon, 3 Feb 2020 09:51:12 +1300 >Subject: [PATCH 2/2] 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) >--- > pidl/wscript | 7 ------- > script/autobuild.py | 2 +- > 2 files changed, 1 insertion(+), 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") > ], > >-- >2.20.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
abartlet
:
review+
Actions:
View
Attachments on
bug 14284
:
15799
| 15800