Tue May 11 10:57:34 2021 UTC ()
Re-enable building databases/ldb without ldap support.
(hauke)
diff -r1.21 -r1.22 pkgsrc/databases/ldb/Makefile
diff -r1.12 -r1.13 pkgsrc/databases/ldb/distinfo
diff -r1.3 -r1.4 pkgsrc/databases/ldb/options.mk
diff -r0 -r1.1 pkgsrc/databases/ldb/patches/patch-wscript
--- pkgsrc/databases/ldb/Makefile 2021/04/14 19:07:49 1.21
+++ pkgsrc/databases/ldb/Makefile 2021/05/11 10:57:34 1.22
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2021/04/14 19:07:49 adam Exp $
+# $NetBSD: Makefile,v 1.22 2021/05/11 10:57:34 hauke Exp $
# Before updating, make sure net/samba4 supports the newer version.
DISTNAME= ldb-2.3.0
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.samba.org/ftp/ldb/
--- pkgsrc/databases/ldb/distinfo 2021/04/14 19:07:49 1.12
+++ pkgsrc/databases/ldb/distinfo 2021/05/11 10:57:34 1.13
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/04/14 19:07:49 adam Exp $
+$NetBSD: distinfo,v 1.13 2021/05/11 10:57:34 hauke Exp $
SHA1 (ldb-2.3.0.tar.gz) = 71c12e1c5914172c450c992dae3b90c1f01b2419
RMD160 (ldb-2.3.0.tar.gz) = b4a58a8a118420a334ecf94a6262684321fa7752
@@ -7,3 +7,4 @@
SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 813c639e404e3b301444decae318c702c87f0cc1
SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
+SHA1 (patch-wscript) = ad5dd815e97e29e5c19e5f45165cac490d01492d
--- pkgsrc/databases/ldb/options.mk 2020/05/19 00:21:01 1.3
+++ pkgsrc/databases/ldb/options.mk 2021/05/11 10:57:34 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2020/05/19 00:21:01 gutteridge Exp $
+# $NetBSD: options.mk,v 1.4 2021/05/11 10:57:34 hauke Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ldb
PKG_SUPPORTED_OPTIONS= ldap
@@ -13,9 +13,9 @@
PLIST.ldap= yes
.else
# No official way to configure without ldap
-CFG_CACHE= ${WRKSRC}/bin/c4che/default_cache.py
-post-configure:
- ${MV} ${CFG_CACHE} ${CFG_CACHE}.orig
+WSCRIPT= ${WRKSRC}/wscript
+pre-configure:
+ ${MV} ${WSCRIPT} ${WSCRIPT}.old
${SED} -E -e 's/(ENABLE_LDAP_BACKEND =) True/\1 False/g' \
- ${CFG_CACHE}.orig > ${CFG_CACHE}
+ ${WSCRIPT}.old > ${WSCRIPT}
.endif
$NetBSD: patch-wscript,v 1.1 2021/05/11 10:57:34 hauke Exp $
Since the build system does not provide an ldap switch, we patch this script
from options.mk with sed(1) to disable building with ldap support
Changes make sure not to build any ldap dependencies when that is what we want.
--- wscript.orig 2020-07-09 12:04:50.000000000 +0000
+++ wscript
@@ -148,6 +148,8 @@ def configure(conf):
# we need this for the ldap backend
if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
conf.env.ENABLE_LDAP_BACKEND = True
+ else:
+ conf.env.ENABLE_LDAP_BACKEND = False
# we don't want any libraries or modules to rely on runtime
# resolution of symbols
@@ -534,6 +536,7 @@ def build(bld):
bld.SAMBA_BINARY('lldb_ldap_test',
source='tests/lldb_ldap.c',
deps='cmocka talloc lber ldap ldb',
+ enabled=bld.env.ENABLE_LDAP_BACKEND,
install=False)
if bld.CONFIG_SET('HAVE_LMDB'):
@@ -640,7 +643,7 @@ def test(ctx):
# if LIB_LDAP and LIB_LBER defined, then we can test ldb_ldap backend
# behavior regression for bz#14413
- if env.LIB_LDAP and env.LIB_LBER:
+ if bld.env.ENABLE_LDAP_BACKEND and env.LIB_LDAP and env.LIB_LBER:
test_exes += ["lldb_ldap_test"]
if env.HAVE_LMDB: