Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/ldb Unbreak building without ldap support - ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/02eebe035038
branches:  trunk
changeset: 432086:02eebe035038
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Mon May 18 15:39:20 2020 +0000

description:
Unbreak building without ldap support - the library got built and
installed, anyway, resulting in a PLIST error.

ldb's snazzy little build system has no official configuration option
for this, so we reach in and flick the switch by hand.

diffstat:

 databases/ldb/Makefile   |  3 ++-
 databases/ldb/options.mk |  9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 0a6d1f06306b -r 02eebe035038 databases/ldb/Makefile
--- a/databases/ldb/Makefile    Mon May 18 15:19:41 2020 +0000
+++ b/databases/ldb/Makefile    Mon May 18 15:39:20 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2020/04/29 10:00:12 adam Exp $
+# $NetBSD: Makefile,v 1.15 2020/05/18 15:39:20 hauke Exp $
 
 # Before updating, make sure net/samba4 supports the newer version.
 DISTNAME=      ldb-2.1.2
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://www.samba.org/ftp/ldb/
 
diff -r 0a6d1f06306b -r 02eebe035038 databases/ldb/options.mk
--- a/databases/ldb/options.mk  Mon May 18 15:19:41 2020 +0000
+++ b/databases/ldb/options.mk  Mon May 18 15:39:20 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/03/18 00:29:38 tnn Exp $
+# $NetBSD: options.mk,v 1.2 2020/05/18 15:39:20 hauke Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ldb
 PKG_SUPPORTED_OPTIONS= ldap
@@ -11,4 +11,11 @@
 .if !empty(PKG_OPTIONS:Mldap)
 .  include "../../databases/openldap-client/buildlink3.mk"
 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
+       sed -E -e 's/(ENABLE_LDAP_BACKEND =) True/\1 False/g' \
+               ${CFG_CACHE}.orig > ${CFG_CACHE}
 .endif



Home | Main Index | Thread Index | Old Index