tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
nss_ldap and libcrypto from pkgsrc
Hello
When using PREFER_PKGSRC=openssl we get nss_ldap to mix libcrypto versions.
It gets /usr/pkg/lib/libcrypto.so from libldap dependency, and
/usr/lib/libcrypto.so from libkrb5 dependency.
Here is a patch to introduce a krb5 option to databases/nss_ldap so that
the depency on libkrb5 can be removed, when it is not needed.
Is it ok to commit that fix?
--- pkgsrc/databases/nss_ldap/Makefile.orig
+++ pkgsrc/databases/nss_ldap/Makefile
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.23 2010/11/03 11:39:07 adam Exp $
DISTNAME= nss_ldap-265
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases
MASTER_SITES= http://www.padl.com/download/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -34,6 +34,8 @@
pre-build:
${CP} ${FILESDIR}/netbsd.c ${FILESDIR}/netbsd.h ${WRKSRC}
${LN} -fs /usr/include/nsswitch.h ${BUILDLINK_DIR}/include/nss.h
+.include "options.mk"
+
.include "../../databases/openldap-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/databases/nss_ldap/options.mk.orig
+++ pkgsrc/databases/nss_ldap/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.nss_ldap
+PKG_SUPPORTED_OPTIONS= krb5
+PKG_SUGGESTED_OPTIONS= krb5
+
+.include "../../mk/bsd.options.mk"
+
+.if empty(PKG_OPTIONS:Mkrb5)
+SUBST_CLASSES+= krb5
+SUBST_STAGE.krb5= post-configure
+SUBST_FILES.krb5= Makefile
+SUBST_SED.krb5= -e "s/-lkrb5//; s/-lcom_err//; s/-lgssapi//;"
+.endif
--
Emmanuel Dreyfus
manu%netbsd.org@localhost
Home |
Main Index |
Thread Index |
Old Index