[Pkg-samba-maint] [samba] 10/10: ctdb/wscript: Call CHECK_XSLTPROC_MANPAGES() before checking XSLTPROC_MANPAGES

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch experimental
in repository samba.

commit ef401bff8364b6e55c5980c317760d14fcdc5cc1
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Oct 12 20:46:57 2016 +0200

    ctdb/wscript: Call CHECK_XSLTPROC_MANPAGES() before checking XSLTPROC_MANPAGES
    
    This should fix parallel builds, including tests.reproducible-builds.org
    
    Thanks HW42 on IRC
---
 ctdb/wscript                            |  1 +
 debian/patches/Fix_parallel_build.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 30 insertions(+)

diff --git a/ctdb/wscript b/ctdb/wscript
index 1e80e01..bef69cd 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -230,6 +230,7 @@ def configure(conf):
         conf.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True)
         conf.SAMBA_CONFIG_H()
 
+    conf.CHECK_XSLTPROC_MANPAGES()
     if 'XSLTPROC_MANPAGES' in conf.env and conf.env['XSLTPROC_MANPAGES']:
         conf.env.ctdb_generate_manpages = True
     else:
diff --git a/debian/patches/Fix_parallel_build.patch b/debian/patches/Fix_parallel_build.patch
new file mode 100644
index 0000000..fd04a5e
--- /dev/null
+++ b/debian/patches/Fix_parallel_build.patch
@@ -0,0 +1,28 @@
+From 2f579b37764e14c1b09581dbd4841def7b72b64e Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Wed, 12 Oct 2016 20:46:57 +0200
+Subject: [PATCH] ctdb/wscript: Call CHECK_XSLTPROC_MANPAGES() before checking
+ XSLTPROC_MANPAGES
+
+This should fix parallel builds, including tests.reproducible-builds.org
+
+Thanks HW42 on IRC
+---
+ ctdb/wscript | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ctdb/wscript b/ctdb/wscript
+index 618dd29..6dbff3d 100755
+--- a/ctdb/wscript
++++ b/ctdb/wscript
+@@ -228,6 +228,7 @@ def configure(conf):
+         conf.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True)
+         conf.SAMBA_CONFIG_H()
+ 
++    conf.CHECK_XSLTPROC_MANPAGES()
+     if 'XSLTPROC_MANPAGES' in conf.env and conf.env['XSLTPROC_MANPAGES']:
+         conf.env.ctdb_generate_manpages = True
+     else:
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index ce2c8c7..ee1cbfb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ Add-documentation-to-systemd-Unit-files.patch
 fix_kill_path_in_units.patch
 bug_12283_segfault_tevent_internals.patch
 gencache-Bail-out-of-stabilize-if-we-can-not-get-the.patch
+Fix_parallel_build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git