mirror of
https://git.freebsd.org/ports.git
synced 2025-05-01 11:06:39 -04:00
8736a24d16
PR: 280533 Sponsored by: Klara, Inc. Approved by: 0mp (mentor) Approved by: samba (0mp, kiwi)
61 lines
2.5 KiB
Text
61 lines
2.5 KiB
Text
--- lib/ldb/wscript.orig 2019-07-08 12:47:51 UTC
|
|
+++ lib/ldb/wscript
|
|
@@ -208,7 +208,7 @@ def build(bld):
|
|
if bld.env.standalone_ldb:
|
|
if not 'PACKAGE_VERSION' in bld.env:
|
|
bld.env.PACKAGE_VERSION = VERSION
|
|
- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
|
|
+ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
|
|
private_library = False
|
|
else:
|
|
private_library = True
|
|
@@ -285,7 +285,6 @@ def build(bld):
|
|
pc_files='ldb.pc',
|
|
vnum=VERSION,
|
|
private_library=private_library,
|
|
- manpages='man/ldb.3',
|
|
abi_directory='ABI',
|
|
abi_match = abi_match)
|
|
|
|
@@ -438,7 +437,7 @@ def build(bld):
|
|
|
|
LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
|
|
for t in LDB_TOOLS.split():
|
|
- bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline ldb',
|
|
+ bld.SAMBA_BINARY('samba-%s' % t, 'tools/%s.c' % t, deps='ldb-cmdline ldb',
|
|
manpages='man/%s.1' % t)
|
|
|
|
# ldbtest doesn't get installed
|
|
@@ -450,10 +449,10 @@ def build(bld):
|
|
else:
|
|
lmdb_deps = ''
|
|
# ldbdump doesn't get installed
|
|
- bld.SAMBA_BINARY('ldbdump',
|
|
+ bld.SAMBA_BINARY('samba-ldbdump',
|
|
'tools/ldbdump.c',
|
|
deps='ldb-cmdline ldb' + lmdb_deps,
|
|
- install=False)
|
|
+ install=True)
|
|
|
|
bld.SAMBA_LIBRARY('ldb-cmdline',
|
|
source='tools/ldbutil.c tools/cmdline.c',
|
|
@@ -498,11 +497,6 @@ def build(bld):
|
|
deps='cmocka ldb',
|
|
install=False)
|
|
|
|
- bld.SAMBA_BINARY('ldb_match_test',
|
|
- source='tests/ldb_match_test.c',
|
|
- deps='cmocka ldb',
|
|
- install=False)
|
|
-
|
|
bld.SAMBA_BINARY('ldb_key_value_test',
|
|
source='tests/ldb_key_value_test.c',
|
|
deps='cmocka ldb ldb_tdb_err_map',
|
|
@@ -641,7 +635,6 @@ def test(ctx):
|
|
'ldb_tdb_guid_mod_op_test',
|
|
'ldb_tdb_kv_ops_test',
|
|
'ldb_tdb_test',
|
|
- 'ldb_match_test',
|
|
'ldb_key_value_test',
|
|
# we currently don't run ldb_key_value_sub_txn_tdb_test as it
|
|
# tests the nested/sub transaction handling
|