e365ff6619
Added patches from upstream bug tracker to fix cross-compile problems, removed patches applied upstream and rebase remaining patches. The dependency to gnutls is now mandatory: https://blog.cryptomilk.org/2019/10/02/samba-and-gnutls/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 0daf4e72271951e21afa73911e304df1b046909c Mon Sep 17 00:00:00 2001
|
|
From: Uri Simchoni <uri@samba.org>
|
|
Date: Mon, 7 Oct 2019 00:37:17 +0300
|
|
Subject: [PATCH] wafsamba: use test_args instead of exec_args to support
|
|
cross-compilation
|
|
|
|
exec_args seems to have been a custom addition to Samba's copy of waf.
|
|
Upstream Waf has an identically-purposed parameter called test_args.
|
|
|
|
This parameter is being used for addiing runtime args to test programs that
|
|
are being run during configuration phases.
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13846
|
|
|
|
Signed-off-by: Uri Simchoni <uri@samba.org>
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
buildtools/wafsamba/samba_autoconf.py | 6 +++---
|
|
buildtools/wafsamba/samba_cross.py | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
|
|
index 8e5dfb87102..62d3e20a15c 100644
|
|
--- a/buildtools/wafsamba/samba_autoconf.py
|
|
+++ b/buildtools/wafsamba/samba_autoconf.py
|
|
@@ -423,9 +423,9 @@ def CHECK_CODE(conf, code, define,
|
|
cflags.extend(ccflags)
|
|
|
|
if on_target:
|
|
- exec_args = conf.SAMBA_CROSS_ARGS(msg=msg)
|
|
+ test_args = conf.SAMBA_CROSS_ARGS(msg=msg)
|
|
else:
|
|
- exec_args = []
|
|
+ test_args = []
|
|
|
|
conf.COMPOUND_START(msg)
|
|
|
|
@@ -440,7 +440,7 @@ def CHECK_CODE(conf, code, define,
|
|
type=type,
|
|
msg=msg,
|
|
quote=quote,
|
|
- exec_args=exec_args,
|
|
+ test_args=test_args,
|
|
define_ret=define_ret)
|
|
except Exception:
|
|
if always:
|
|
diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
|
|
index 8863c2c53e7..60ddf967237 100644
|
|
--- a/buildtools/wafsamba/samba_cross.py
|
|
+++ b/buildtools/wafsamba/samba_cross.py
|
|
@@ -139,7 +139,7 @@ class cross_Popen(Utils.subprocess.Popen):
|
|
|
|
@conf
|
|
def SAMBA_CROSS_ARGS(conf, msg=None):
|
|
- '''get exec_args to pass when running cross compiled binaries'''
|
|
+ '''get test_args to pass when running cross compiled binaries'''
|
|
if not conf.env.CROSS_COMPILE:
|
|
return []
|
|
|
|
--
|
|
2.20.1
|
|
|