diff options
| author | Thomas Nagy <tnagy@waf.io> | 2016-03-26 13:18:07 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-05 06:37:21 +0200 |
| commit | 8077f462c9854bf8ff3e5ce09c0f22f02cb21910 (patch) | |
| tree | 5753140f209205a10386ffff8c4059429a8060a6 /source4 | |
| parent | f3e349bebc443133fdbe4e14b148ca8db8237060 (diff) | |
| download | samba-8077f462c9854bf8ff3e5ce09c0f22f02cb21910.tar.gz | |
build:wafsamba: Build on waf 1.9
Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal_build/wscript_build | 4 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 2072be42e7d..109852efb14 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -157,7 +157,7 @@ def HEIMDAL_ERRTABLE(name, source): t = bld(rule='"${SRC[1].abspath(env)}" "${TGT[0].parent.abspath(env)}" "${COMPILE_ET}" "${SRC[0].abspath(env)}" ${TGT[0].bldpath(env)}', ext_out = '.c', - before = 'cc', + before = 'c', update_outputs = True, shell = True, source = sources, @@ -178,7 +178,7 @@ def HEIMDAL_AUTOPROTO(header, source, options=None, group='prototypes'): target=header, update_outputs=True, ext_out='.c', - before='cc') + before='c') t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal') t.env.OPTIONS = options diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 19f0bf218ec..27447c170c6 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -170,7 +170,7 @@ if not krb5_config: krb5_config = conf.find_program("krb5-config", var="HEIMDAL_KRB5_CONFIG") if krb5_config: # Not ideal, but seems like the best way to get at these paths: - f = open(krb5_config, 'r') + f = open(krb5_config[0], 'r') try: for l in f: if l.startswith("libdir="): @@ -216,10 +216,10 @@ if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): # and include config.h if it is set, resulting in failure (since config.h # doesn't yet exist) -CCDEFINES = list(conf.env.CCDEFINES) +DEFINES = list(conf.env.DEFINES) conf.undefine("HAVE_CONFIG_H") -while "HAVE_CONFIG_H=1" in conf.env.CCDEFINES: - conf.env.CCDEFINES.remove("HAVE_CONFIG_H=1") +while "HAVE_CONFIG_H=1" in conf.env.DEFINES: + conf.env.DEFINES.remove("HAVE_CONFIG_H=1") try: check_system_heimdal_lib("wind", "wind_stringprep", "wind.h", onlyif="roken") check_system_heimdal_lib("hx509", "hx509_bitstring_print", "hx509.h", onlyif="roken wind") @@ -249,7 +249,7 @@ try: check_system_heimdal_lib("kdc", "kdc_log", "kdc.h", onlyif="roken krb5 hdb asn1 heimntlm hcrypto com_err wind heimbase") finally: - conf.env.CCDEFINES = CCDEFINES + conf.env.DEFINES = DEFINES # With the proper checks in place we should be able to build against the system libtommath. #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): |