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
#!/usr/bin/env python
from waflib import Options
-from waflib import Utils
+from waflib import Errors
def configure(conf):
if Options.options.accel_aes.lower() == "intelaesni":
print("Compiling with Intel AES instructions")
conf.DEFINE('HAVE_AESNI_INTEL', 1)
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:
- 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'):
- 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):
if not bld.CONFIG_SET('HAVE_AESNI_INTEL'):
import os
import sys
import samba_git
-from waflib import Options, Utils
+from waflib import Options, Errors
# work out what python external libraries we need to install
external_pkgs = {
__import__(module)
except ImportError:
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 \
out the relevant submodule by running 'git submodule update --init'.
""" % module)
else:
- raise Utils.WafError("""\
+ raise Errors.WafError("""\
Unable to find Python module '%s'. Please install the system package or place a copy in
%s.
""" % (module, package))
if Options.options.with_system_heimdalkrb5:
if Options.options.with_system_mitkrb5:
- raise Utils.WafError('--with-system-heimdalkrb5 conflicts with ' +
- '--with-system-mitkrb5')
+ raise Errors.WafError('--with-system-heimdalkrb5 conflicts with ' +
+ '--with-system-mitkrb5')
if not Options.options.without_ad_dc:
- raise Utils.WafError('--with-system-heimdalkrb5 requires ' +
- '--without-ad-dc')
+ raise Errors.WafError('--with-system-heimdalkrb5 requires ' +
+ '--without-ad-dc')
conf.env.SYSTEM_LIBS += ('heimdal', 'asn1', 'com_err', 'roken',
'hx509', 'wind', 'gssapi', 'hcrypto',
'krb5', 'heimbase', 'asn1_compile',