Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From bc4ff7e37ce120c257e52a81fe3475499dfd2573 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Tue, 24 Jul 2018 10:10:24 +0800 |
| 4 | Subject: [PATCH] libldb: fix config error |
| 5 | |
| 6 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 7 | --- |
| 8 | wscript | 58 +++++++++++++++++++++++++++++----------------------------- |
| 9 | 1 file changed, 29 insertions(+), 29 deletions(-) |
| 10 | |
| 11 | diff --git a/wscript b/wscript |
| 12 | index b0af7b6..8ad9f96 100644 |
| 13 | --- a/wscript |
| 14 | +++ b/wscript |
| 15 | @@ -115,40 +115,40 @@ def configure(conf): |
| 16 | onlyif='talloc tdb tevent pyldb-util', |
| 17 | implied_deps='replace talloc tdb tevent'): |
| 18 | conf.define('USING_SYSTEM_LDB', 1) |
| 19 | + if not Options.options.without_ldb_lmdb: |
| 20 | + if not conf.CHECK_CODE('return !(sizeof(size_t) >= 8)', |
| 21 | + "HAVE_64_BIT_SIZE_T_FOR_LMDB", |
| 22 | + execute=True, |
| 23 | + msg='Checking for a 64-bit host to ' |
| 24 | + 'support lmdb'): |
| 25 | + Logs.warn("--without-ldb-lmdb implied as this " |
| 26 | + "host is not 64-bit") |
| 27 | + |
| 28 | + if not conf.env.standalone_ldb and \ |
| 29 | + not Options.options.without_ad_dc and \ |
| 30 | + conf.CONFIG_GET('ENABLE_SELFTEST'): |
| 31 | + Logs.warn("NOTE: Some AD DC parts of selftest will fail") |
| 32 | |
| 33 | - if not conf.CHECK_CODE('return !(sizeof(size_t) >= 8)', |
| 34 | - "HAVE_64_BIT_SIZE_T_FOR_LMDB", |
| 35 | - execute=True, |
| 36 | - msg='Checking for a 64-bit host to ' |
| 37 | - 'support lmdb'): |
| 38 | - Logs.warn("--without-ldb-lmdb implied as this " |
| 39 | - "host is not 64-bit") |
| 40 | - |
| 41 | - if not conf.env.standalone_ldb and \ |
| 42 | - not Options.options.without_ad_dc and \ |
| 43 | - conf.CONFIG_GET('ENABLE_SELFTEST'): |
| 44 | - Logs.warn("NOTE: Some AD DC parts of selftest will fail") |
| 45 | - |
| 46 | - conf.env.REQUIRE_LMDB = False |
| 47 | - else: |
| 48 | - if conf.env.standalone_ldb: |
| 49 | - if Options.options.without_ldb_lmdb: |
| 50 | - conf.env.REQUIRE_LMDB = False |
| 51 | - else: |
| 52 | - conf.env.REQUIRE_LMDB = True |
| 53 | - elif Options.options.without_ad_dc: |
| 54 | conf.env.REQUIRE_LMDB = False |
| 55 | else: |
| 56 | - if Options.options.without_ldb_lmdb: |
| 57 | - if not Options.options.without_ad_dc and \ |
| 58 | - conf.CONFIG_GET('ENABLE_SELFTEST'): |
| 59 | - raise Utils.WafError('--without-ldb-lmdb conflicts ' |
| 60 | - 'with --enable-selftest while ' |
| 61 | - 'building the AD DC') |
| 62 | - |
| 63 | + if conf.env.standalone_ldb: |
| 64 | + if Options.options.without_ldb_lmdb: |
| 65 | + conf.env.REQUIRE_LMDB = False |
| 66 | + else: |
| 67 | + conf.env.REQUIRE_LMDB = True |
| 68 | + elif Options.options.without_ad_dc: |
| 69 | conf.env.REQUIRE_LMDB = False |
| 70 | else: |
| 71 | - conf.env.REQUIRE_LMDB = True |
| 72 | + if Options.options.without_ldb_lmdb: |
| 73 | + if not Options.options.without_ad_dc and \ |
| 74 | + conf.CONFIG_GET('ENABLE_SELFTEST'): |
| 75 | + raise Utils.WafError('--without-ldb-lmdb conflicts ' |
| 76 | + 'with --enable-selftest while ' |
| 77 | + 'building the AD DC') |
| 78 | + |
| 79 | + conf.env.REQUIRE_LMDB = False |
| 80 | + else: |
| 81 | + conf.env.REQUIRE_LMDB = True |
| 82 | |
| 83 | |
| 84 | if conf.CONFIG_SET('USING_SYSTEM_LDB'): |
| 85 | -- |
| 86 | 2.7.4 |
| 87 | |