0003-wafsamba-use-test_args-instead-of-exec_args-to-suppo.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. From 0daf4e72271951e21afa73911e304df1b046909c Mon Sep 17 00:00:00 2001
  2. From: Uri Simchoni <uri@samba.org>
  3. Date: Mon, 7 Oct 2019 00:37:17 +0300
  4. Subject: [PATCH] wafsamba: use test_args instead of exec_args to support
  5. cross-compilation
  6. exec_args seems to have been a custom addition to Samba's copy of waf.
  7. Upstream Waf has an identically-purposed parameter called test_args.
  8. This parameter is being used for addiing runtime args to test programs that
  9. are being run during configuration phases.
  10. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13846
  11. Signed-off-by: Uri Simchoni <uri@samba.org>
  12. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  13. ---
  14. buildtools/wafsamba/samba_autoconf.py | 6 +++---
  15. buildtools/wafsamba/samba_cross.py | 2 +-
  16. 2 files changed, 4 insertions(+), 4 deletions(-)
  17. diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
  18. index 8e5dfb87102..62d3e20a15c 100644
  19. --- a/buildtools/wafsamba/samba_autoconf.py
  20. +++ b/buildtools/wafsamba/samba_autoconf.py
  21. @@ -423,9 +423,9 @@ def CHECK_CODE(conf, code, define,
  22. cflags.extend(ccflags)
  23. if on_target:
  24. - exec_args = conf.SAMBA_CROSS_ARGS(msg=msg)
  25. + test_args = conf.SAMBA_CROSS_ARGS(msg=msg)
  26. else:
  27. - exec_args = []
  28. + test_args = []
  29. conf.COMPOUND_START(msg)
  30. @@ -440,7 +440,7 @@ def CHECK_CODE(conf, code, define,
  31. type=type,
  32. msg=msg,
  33. quote=quote,
  34. - exec_args=exec_args,
  35. + test_args=test_args,
  36. define_ret=define_ret)
  37. except Exception:
  38. if always:
  39. diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
  40. index 8863c2c53e7..60ddf967237 100644
  41. --- a/buildtools/wafsamba/samba_cross.py
  42. +++ b/buildtools/wafsamba/samba_cross.py
  43. @@ -139,7 +139,7 @@ class cross_Popen(Utils.subprocess.Popen):
  44. @conf
  45. def SAMBA_CROSS_ARGS(conf, msg=None):
  46. - '''get exec_args to pass when running cross compiled binaries'''
  47. + '''get test_args to pass when running cross compiled binaries'''
  48. if not conf.env.CROSS_COMPILE:
  49. return []
  50. --
  51. 2.20.1