Mon Jul 21 12:57:20 2014 UTC ()
Prevent unsupported build option detection for the case using builtin one.
Fixes PR pkg/47221.


(obache)
diff -r1.15 -r1.16 pkgsrc/databases/openldap-client/buildlink3.mk
cvs diff -r1.15 -r1.16 pkgsrc/databases/openldap-client/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/databases/openldap-client/buildlink3.mk 2014/02/12 23:17:39 1.15
+++ pkgsrc/databases/openldap-client/buildlink3.mk 2014/07/21 12:57:20 1.16
@@ -1,27 +1,33 @@ @@ -1,27 +1,33 @@
1# $NetBSD: buildlink3.mk,v 1.15 2014/02/12 23:17:39 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2014/07/21 12:57:20 obache Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_TREE+= openldap-client 5BUILDLINK_TREE+= openldap-client
6 6
7.if !defined(OPENLDAP_BUILDLINK3_MK) 7.if !defined(OPENLDAP_BUILDLINK3_MK)
8OPENLDAP_BUILDLINK3_MK:= 8OPENLDAP_BUILDLINK3_MK:=
9 9
10BUILDLINK_API_DEPENDS.openldap-client+= openldap-client>=2.4.6 10BUILDLINK_API_DEPENDS.openldap-client+= openldap-client>=2.4.6
11BUILDLINK_ABI_DEPENDS.openldap-client+= openldap-client>=2.4.39nb1 11BUILDLINK_ABI_DEPENDS.openldap-client+= openldap-client>=2.4.39nb1
12BUILDLINK_PKGSRCDIR.openldap-client?= ../../databases/openldap-client 12BUILDLINK_PKGSRCDIR.openldap-client?= ../../databases/openldap-client
13 13
14# Export the deprecated API from the openldap-2.2.x releases. 14# Export the deprecated API from the openldap-2.2.x releases.
15BUILDLINK_CPPFLAGS.openldap-client+= -DLDAP_DEPRECATED 15BUILDLINK_CPPFLAGS.openldap-client+= -DLDAP_DEPRECATED
16 16
 17CHECK_BUILTIN.openldap-client:= yes
 18.include "../../databases/openldap-client/builtin.mk"
 19CHECK_BUILTIN.openldap-client:= no
 20
 21. if empty(USE_BUILTIN.openldap-client:M[yY][eE][sS])
17pkgbase := openldap-client 22pkgbase := openldap-client
18.include "../../mk/pkg-build-options.mk" 23.include "../../mk/pkg-build-options.mk"
19 24
20.if !empty(PKG_BUILD_OPTIONS.openldap-client:Mkerberos) || \ 25.if !empty(PKG_BUILD_OPTIONS.openldap-client:Mkerberos) || \
21 !empty(PKG_BUILD_OPTIONS.openldap-client:Msasl) 26 !empty(PKG_BUILD_OPTIONS.openldap-client:Msasl)
22. include "../../security/cyrus-sasl/buildlink3.mk" 27. include "../../security/cyrus-sasl/buildlink3.mk"
23.endif 28.endif
 29. endif
24.include "../../security/openssl/buildlink3.mk" 30.include "../../security/openssl/buildlink3.mk"
25.endif # OPENLDAP_BUILDLINK3_MK 31.endif # OPENLDAP_BUILDLINK3_MK
26 32
27BUILDLINK_TREE+= -openldap-client 33BUILDLINK_TREE+= -openldap-client