Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 1 | From f6fa33bfc2e1272198db6ea08910b4162b364b18 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Bian Naimeng <biannm@cn.fujitsu.com> |
| 3 | Date: Mon, 18 Apr 2016 17:00:53 -0400 |
| 4 | Subject: [PATCH] Don't check xsltproc manpages |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 5 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 6 | Upstream-Status: Pending |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 7 | |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 8 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> |
| 9 | |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 10 | Rebase to 4.14.4 |
| 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 12 | --- |
| 13 | lib/ldb/wscript | 2 +- |
| 14 | lib/talloc/wscript | 2 +- |
| 15 | lib/tdb/wscript | 2 +- |
| 16 | 3 files changed, 3 insertions(+), 3 deletions(-) |
| 17 | |
| 18 | diff --git a/lib/ldb/wscript b/lib/ldb/wscript |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 19 | index 60bb7cf..b7b0152 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 20 | --- a/lib/ldb/wscript |
| 21 | +++ b/lib/ldb/wscript |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 22 | @@ -144,7 +144,7 @@ def configure(conf): |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 23 | conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 24 | |
| 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 Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 31 | diff --git a/lib/talloc/wscript b/lib/talloc/wscript |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 32 | index 3089663..76cd65e 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 33 | --- a/lib/talloc/wscript |
| 34 | +++ b/lib/talloc/wscript |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 35 | @@ -48,7 +48,7 @@ def configure(conf): |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 36 | conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' |
| 37 | conf.env.TALLOC_VERSION = VERSION |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 38 | |
| 39 | - conf.CHECK_XSLTPROC_MANPAGES() |
| 40 | + #conf.CHECK_XSLTPROC_MANPAGES() |
| 41 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 42 | conf.CHECK_HEADERS('sys/auxv.h') |
| 43 | conf.CHECK_FUNCS('getauxval') |
| 44 | diff --git a/lib/tdb/wscript b/lib/tdb/wscript |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 45 | index 71ada31..accd474 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 46 | --- a/lib/tdb/wscript |
| 47 | +++ b/lib/tdb/wscript |
Andrew Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 48 | @@ -95,7 +95,7 @@ def configure(conf): |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 49 | 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 Geissler | 6972109 | 2021-07-23 12:57:00 -0400 | [diff] [blame] | 55 | conf.SAMBA_CHECK_PYTHON() |
| 56 | conf.SAMBA_CHECK_PYTHON_HEADERS() |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 57 | -- |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 58 | 2.25.1 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 59 | |