Attachment 15656 Details for Bug 13856 – git-am fix for 4.11.next and 4.10.next

[patch] git-am fix for 4.11.next and 4.10.next

fix-13856.patch (text/plain), 1.76 KB, created by Uri Simchoni on 2019-12-01 18:53:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Simchoni

Created: 2019-12-01 18:53:26 UTC

Size: 1.76 KB

patch

obsolete

>From f4131d928d11a05652feb4de4d493f01cace9a76 Mon Sep 17 00:00:00 2001
>From: Uri Simchoni <uri@samba.org>
>Date: Sun, 20 Oct 2019 21:36:11 +0300
>Subject: [PATCH] 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 <bernd.kuhls@t-online.de>.
>
>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 <uri@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
>Autobuild-Date(master): Sun Dec  1 10:22:01 UTC 2019 on sn-devel-184
>
>(cherry picked from commit 27fc062d7ea2207242d5a2c9933f3de5fa206488)
>---
> source4/heimdal_build/wscript_build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
>index 163b622fca9..27adbc06dc6 100644
>--- a/source4/heimdal_build/wscript_build
>+++ b/source4/heimdal_build/wscript_build
>@@ -140,7 +140,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)
> 
> 
>-- 
>2.23.0
>

Flags:

abartlet: review+
uri: ci-passed+

Actions: View

Attachments on bug 13856: 15036 | 15037 | 15038 | 15039 | 15296 | 15656