diff options
| -rw-r--r-- | third_party/aesni-intel/wscript | 8 | ||||
| -rw-r--r-- | third_party/wscript | 6 | ||||
| -rw-r--r-- | wscript | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript index bb874454ca6..955b5162140 100644 --- a/third_party/aesni-intel/wscript +++ b/third_party/aesni-intel/wscript @@ -1,6 +1,6 @@ #!/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": @@ -14,11 +14,11 @@ def configure(conf): 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'): diff --git a/third_party/wscript b/third_party/wscript index c4744b7a589..f7a6daff0dd 100644 --- a/third_party/wscript +++ b/third_party/wscript @@ -3,7 +3,7 @@ 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 = { @@ -29,12 +29,12 @@ def find_third_party_module(conf, module, package): __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)) @@ -237,11 +237,11 @@ def configure(conf): 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', |