sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

waf: Utils package not defined

Browse Source 
Fix the package name for the WafError routine.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Tue Dec  4 18:45:38 CET 2018 on sn-devel-144
This commit is contained in:
Swen Schillig 2018-11-26 20:14:21 +01:00 committed by Alexander Bokovoy
parent 5517d60653
commit dfbfb7eb94
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
third_party/aesni-intel/wscript vendored
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
from waflib import Options from waflib import Options
from waflib import Utils from waflib import Errors
def configure(conf): def configure(conf):
if Options.options.accel_aes.lower() == "intelaesni": if Options.options.accel_aes.lower() == "intelaesni":
@ -14,11 +14,11 @@ def configure(conf):
print("Compiling with Intel AES instructions") print("Compiling with Intel AES instructions")
conf.DEFINE('HAVE_AESNI_INTEL', 1) conf.DEFINE('HAVE_AESNI_INTEL', 1)
else: else:
raise Utils.WafError('--accel-aes=intelaesni selected and non x86_64 CPU') raise Errors.WafError('--accel-aes=intelaesni selected and non x86_64 CPU')
else: else:
raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects ' + str(asm_flags)) raise Errors.WafError('--aes-accel=intelaesni selected and compiler rejects ' + str(asm_flags))
if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'): if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'):
raise Utils.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack') raise Errors.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack')
def build(bld): def build(bld):
if not bld.CONFIG_SET('HAVE_AESNI_INTEL'): if not bld.CONFIG_SET('HAVE_AESNI_INTEL'):

6
third_party/wscript vendored
View File

@ -3,7 +3,7 @@
import os import os
import sys import sys
import samba_git import samba_git
from waflib import Options, Utils from waflib import Options, Errors
# work out what python external libraries we need to install # work out what python external libraries we need to install
external_pkgs = { external_pkgs = {
@ -29,12 +29,12 @@ def find_third_party_module(conf, module, package):
__import__(module) __import__(module)
except ImportError: except ImportError:
if samba_git.has_submodules(conf.srcnode.abspath()): if samba_git.has_submodules(conf.srcnode.abspath()):
raise Utils.WafError("""\ raise Errors.WafError("""\
Unable to find Python module '%s'. Please install the system package or check \ Unable to find Python module '%s'. Please install the system package or check \
out the relevant submodule by running 'git submodule update --init'. out the relevant submodule by running 'git submodule update --init'.
""" % module) """ % module)
else: else:
raise Utils.WafError("""\ raise Errors.WafError("""\
Unable to find Python module '%s'. Please install the system package or place a copy in Unable to find Python module '%s'. Please install the system package or place a copy in
%s. %s.
""" % (module, package)) """ % (module, package))

8
wscript
View File

@ -237,11 +237,11 @@ def configure(conf):
if Options.options.with_system_heimdalkrb5: if Options.options.with_system_heimdalkrb5:
if Options.options.with_system_mitkrb5: if Options.options.with_system_mitkrb5:
raise Utils.WafError('--with-system-heimdalkrb5 conflicts with ' + raise Errors.WafError('--with-system-heimdalkrb5 conflicts with ' +
'--with-system-mitkrb5') '--with-system-mitkrb5')
if not Options.options.without_ad_dc: if not Options.options.without_ad_dc:
raise Utils.WafError('--with-system-heimdalkrb5 requires ' + raise Errors.WafError('--with-system-heimdalkrb5 requires ' +
'--without-ad-dc') '--without-ad-dc')
conf.env.SYSTEM_LIBS += ('heimdal', 'asn1', 'com_err', 'roken', conf.env.SYSTEM_LIBS += ('heimdal', 'asn1', 'com_err', 'roken',
'hx509', 'wind', 'gssapi', 'hcrypto', 'hx509', 'wind', 'gssapi', 'hcrypto',
'krb5', 'heimbase', 'asn1_compile', 'krb5', 'heimbase', 'asn1_compile',