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>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 9c3cf5f67053124c6bbdf9c4705fa1d2d416f873 Mon Sep 17 00:00:00 2001
|
|
From: Uri Simchoni <uri@samba.org>
|
|
Date: Mon, 7 Oct 2019 00:37:31 +0300
|
|
Subject: [PATCH] wafsamba: avoid pre-forking if cross-compilation is enabled
|
|
|
|
Waf supports pre-forking to run configuration tests, but this
|
|
doesn't play well with Samba's cross-compilation support, because
|
|
Samba monkey-patches the actual fork+exec, which doesn't happen
|
|
in a pre-forked process pool.
|
|
|
|
This patch emulates the impact of WAF_NO_PREFORK env var when
|
|
cross-compilation is enabled.
|
|
|
|
The blueprint for the solution has been suggested by Thomas Nagy
|
|
in https://bugzilla.samba.org/show_bug.cgi?id=13846#c7 (item #2)
|
|
|
|
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_cross.py | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
|
|
index 60ddf967237..6fca470f2b7 100644
|
|
--- a/buildtools/wafsamba/samba_cross.py
|
|
+++ b/buildtools/wafsamba/samba_cross.py
|
|
@@ -147,6 +147,8 @@ def SAMBA_CROSS_ARGS(conf, msg=None):
|
|
if real_Popen is None:
|
|
real_Popen = Utils.subprocess.Popen
|
|
Utils.subprocess.Popen = cross_Popen
|
|
+ Utils.run_process = Utils.run_regular_process
|
|
+ Utils.get_process = Utils.alloc_process_pool = Utils.nada
|
|
|
|
ret = []
|
|
|
|
--
|
|
2.20.1
|
|
|