[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sun Feb 2 10:10:03 UTC 2020
The branch, master has been updated
via af47a77673f pidl/wscript: configure should insist on Parse::Yapp::Driver
from 042249d95ff s3: VFS: Implement create_dfs_pathat() in catia.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit af47a77673f58cc6436798b250c90be0e325d20e
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sun Feb 2 16:05:38 2020 +1300
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.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Sun Feb 2 10:09:11 UTC 2020 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
pidl/wscript | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
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):
--
Samba Shared Repository
More information about the samba-cvs
mailing list