From: Stefan Metzmacher Date: Mon, 2 Dec 2019 12:21:57 +0000 (+0100) Subject: s4:heimdal_build: move krb5-types.h into include/krb5-types.h X-Git-Tag: ldb-2.1.0~476 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=787adfbcc9381b19330f1f73c95e34d25613f6b6;p=thirdparty%2Fsamba.git s4:heimdal_build: move krb5-types.h into include/krb5-types.h source4/heimdal_build/include/ contains public headers, which are needed by callers. source4/heimdal_build/*.h should only be used for building the in tree heimdal itself. Without this an '#include "replace.h"' can catch 'config.h' from source4/heimal_build/config.h before bin/default/include/config.h. This #defines HAVE_CLOSEFROM unconditionally before replace.h can define the replacement for rep_closefrom() on systems without libbsd. Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Tue Dec 3 23:36:17 UTC 2019 on sn-devel-184 --- diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index 818bfc041c5..3bb2c521a2c 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -40,7 +40,7 @@ def s3_fix_kwargs(bld, kwargs): extra_includes += [ '../source4/heimdal/lib/com_err', '../source4/heimdal/lib/krb5', '../source4/heimdal/lib/gssapi', - '../source4/heimdal_build', + '../source4/heimdal_build/include', '../bin/default/source4/heimdal/lib/asn1' ] if bld.CONFIG_SET('USING_SYSTEM_TDB'): diff --git a/source4/heimdal_build/krb5-types.h b/source4/heimdal_build/include/krb5-types.h similarity index 100% rename from source4/heimdal_build/krb5-types.h rename to source4/heimdal_build/include/krb5-types.h diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 194defb5680..7f089677664 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -397,7 +397,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'): HEIMDAL_LIBRARY('roken', ROKEN_SOURCE, - includes='../heimdal/lib/roken ../heimdal/include', + includes='../heimdal/lib/roken ../heimdal/include ../heimdal_build/include', deps='resolv util replace', vnum='19.0.1', version_script='lib/roken/version-script.map', @@ -407,7 +407,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'): ROKEN_HOSTCC_SOURCE, use_hostcc=True, use_global_deps=False, - includes='../heimdal/lib/roken', + includes='../heimdal/lib/roken ../heimdal/include ../heimdal_build/include', cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_', group='compiler_libraries', deps='LIBREPLACE_HOSTCC',