blob: 9f597bee2da560ef76640fbf018c881d48eea082 [file] [log] [blame]
Andrew Geissler517393d2023-01-13 08:55:19 -06001From f6fa33bfc2e1272198db6ea08910b4162b364b18 Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: Bian Naimeng <biannm@cn.fujitsu.com>
3Date: Mon, 18 Apr 2016 17:00:53 -0400
4Subject: [PATCH] Don't check xsltproc manpages
Patrick Williamsb48b7b42016-08-17 15:04:38 -05005
Brad Bishop316dfdd2018-06-25 12:45:53 -04006Upstream-Status: Pending
Andrew Geissler69721092021-07-23 12:57:00 -04007
Patrick Williamsb48b7b42016-08-17 15:04:38 -05008Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
9
Andrew Geissler69721092021-07-23 12:57:00 -040010Rebase to 4.14.4
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -040012---
13 lib/ldb/wscript | 2 +-
14 lib/talloc/wscript | 2 +-
15 lib/tdb/wscript | 2 +-
16 3 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/lib/ldb/wscript b/lib/ldb/wscript
Andrew Geissler517393d2023-01-13 08:55:19 -060019index 60bb7cf..b7b0152 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -040020--- a/lib/ldb/wscript
21+++ b/lib/ldb/wscript
Andrew Geissler517393d2023-01-13 08:55:19 -060022@@ -144,7 +144,7 @@ def configure(conf):
Brad Bishop316dfdd2018-06-25 12:45:53 -040023 conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2]))
Patrick Williamsb48b7b42016-08-17 15:04:38 -050024
25 if conf.env.standalone_ldb:
26- conf.CHECK_XSLTPROC_MANPAGES()
27+ #conf.CHECK_XSLTPROC_MANPAGES()
28
29 # we need this for the ldap backend
30 if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
Brad Bishop316dfdd2018-06-25 12:45:53 -040031diff --git a/lib/talloc/wscript b/lib/talloc/wscript
Andrew Geissler517393d2023-01-13 08:55:19 -060032index 3089663..76cd65e 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -040033--- a/lib/talloc/wscript
34+++ b/lib/talloc/wscript
Andrew Geissler69721092021-07-23 12:57:00 -040035@@ -48,7 +48,7 @@ def configure(conf):
Brad Bishop316dfdd2018-06-25 12:45:53 -040036 conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
37 conf.env.TALLOC_VERSION = VERSION
Patrick Williamsb48b7b42016-08-17 15:04:38 -050038
39- conf.CHECK_XSLTPROC_MANPAGES()
40+ #conf.CHECK_XSLTPROC_MANPAGES()
41
Brad Bishop316dfdd2018-06-25 12:45:53 -040042 conf.CHECK_HEADERS('sys/auxv.h')
43 conf.CHECK_FUNCS('getauxval')
44diff --git a/lib/tdb/wscript b/lib/tdb/wscript
Andrew Geissler517393d2023-01-13 08:55:19 -060045index 71ada31..accd474 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -040046--- a/lib/tdb/wscript
47+++ b/lib/tdb/wscript
Andrew Geissler69721092021-07-23 12:57:00 -040048@@ -95,7 +95,7 @@ def configure(conf):
Patrick Williamsb48b7b42016-08-17 15:04:38 -050049 not conf.env.disable_tdb_mutex_locking):
50 conf.define('USE_TDB_MUTEX_LOCKING', 1)
51
52- conf.CHECK_XSLTPROC_MANPAGES()
53+ #conf.CHECK_XSLTPROC_MANPAGES()
54
Andrew Geissler69721092021-07-23 12:57:00 -040055 conf.SAMBA_CHECK_PYTHON()
56 conf.SAMBA_CHECK_PYTHON_HEADERS()
Brad Bishop316dfdd2018-06-25 12:45:53 -040057--
Andrew Geissler517393d2023-01-13 08:55:19 -0600582.25.1
Brad Bishop316dfdd2018-06-25 12:45:53 -040059