The branch, v4-10-test has been updated
via cc58e4b1899 heimdal-build: avoid hard-coded /usr/include/heimdal in
asn1_compile-generated code.
from 939a0c8bb24 ctdb-tcp: Close inflight connecting TCP sockets after
fork
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-10-test
- Log -----------------------------------------------------------------
commit cc58e4b1899d5b89edbf4848efac2e21edd6f259
Author: Uri Simchoni <[email protected]>
Date: Sun Oct 20 21:36:11 2019 +0300
heimdal-build: avoid hard-coded /usr/include/heimdal in
asn1_compile-generated code.
This fixes a cross-compilation issue, as cross-compilers (rightly)
complain if host include directories are in the include path.
The fix is taken from buildroot
(https://github.com/buildroot/buildroot/blob/8b11b96f41a6ffa76556c9bf03a863955871ee57/package/samba4/0006-heimdal_build-wscript_build-do-not-add-host-include-.patch)
where it was applied by Bernd Kuhls <[email protected]>.
This reverts some of 3fe2bfddda6149f6bf7402720226e9285f479fef, but
building Samba's bundled Heimdal with a system roken is not supported
anyway.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13856
Signed-off-by: Uri Simchoni <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Sun Dec 1 10:22:01 UTC 2019 on sn-devel-184
(cherry picked from commit 27fc062d7ea2207242d5a2c9933f3de5fa206488)
Autobuild-User(v4-10-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-10-test): Tue Dec 3 15:06:08 UTC 2019 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal_build/wscript_build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal_build/wscript_build
b/source4/heimdal_build/wscript_build
index 45938b88315..e896c3e9454 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -131,7 +131,7 @@ def HEIMDAL_ASN1(name, source,
samba_cflags = CURRENT_CFLAGS(bld, name, ''),
depends_on = '',
samba_deps = to_list('roken replace'),
- samba_includes = includes + ["/usr/include/heimdal"],
+ samba_includes = includes,
local_include = True)
--
Samba Shared Repository
