diff options
| -rw-r--r-- | databases/openldap-client/buildlink3.mk | 3 | ||||
| -rw-r--r-- | databases/openldap/Makefile.common | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk index f92cac61d9f..86e931b23bb 100644 --- a/databases/openldap-client/buildlink3.mk +++ b/databases/openldap-client/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/10/21 00:20:27 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2012/10/21 09:00:56 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -21,7 +21,6 @@ pkgbase := openldap-client !empty(PKG_BUILD_OPTIONS.openldap-client:Msasl) . include "../../security/cyrus-sasl/buildlink3.mk" .endif -.include "../../net/libfetch/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .endif # OPENLDAP_BUILDLINK3_MK diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common index 38088c53153..b94c675179c 100644 --- a/databases/openldap/Makefile.common +++ b/databases/openldap/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2012/09/28 12:28:53 manu Exp $ +# $NetBSD: Makefile.common,v 1.34 2012/10/21 09:00:55 joerg Exp $ # # used by databases/openldap-client/Makefile # used by databases/openldap-cloak/Makefile @@ -87,9 +87,8 @@ DB_CONFIG?= # empty PTHREAD_OPTS+= require -# This avoids linking with base libfetch.so, which depends on base OpenSSL. -# causing crashes when openldap-client is linked with pkgsrc OpenSSL. -.include "../../net/libfetch/buildlink3.mk" +CONFIGURE_ARGS+= --without-fetch + .include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" |