diff options
| author | fhajny <fhajny@pkgsrc.org> | 2013-03-15 12:35:03 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2013-03-15 12:35:03 +0000 |
| commit | f30dfd2fa8245edb97dd86720740ed537a1476fd (patch) | |
| tree | e7120fb6653883db7c0fb4282106df4745c8f76f | |
| parent | 94fda472f9e592a801d9c04c8a3decc397ec09aa (diff) | |
| download | pkgsrc-f30dfd2fa8245edb97dd86720740ed537a1476fd.tar.gz | |
Ensure that pkgsrc openssl tool is used if not using builtin openssl.
| -rw-r--r-- | mk/tools/replace.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 92acae0f0e8..f231fc57322 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.252 2012/10/01 10:45:16 ryoon Exp $ +# $NetBSD: replace.mk,v 1.253 2013/03/15 12:35:03 fhajny Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -655,6 +655,15 @@ TOOLS_PATH.mtree= ${TOOLS_PREFIX.mtree}/bin/mtree .endif .if !defined(TOOLS_IGNORE.openssl) && !empty(_USE_TOOLS:Mopenssl) +# +# Ensure we use pkgsrc openssl if we're not using builtin. +# +CHECK_BUILTIN.openssl:= yes +. include "../../security/openssl/builtin.mk" +CHECK_BUILTIN.openssl:= no +. if !empty(USE_BUILTIN.openssl:M[nN][oO]) +_TOOLS_USE_PKGSRC.openssl= yes +. endif . if !empty(PKGPATH:Msecurity/openssl) MAKEFLAGS+= TOOLS_IGNORE.openssl= . elif !empty(_TOOLS_USE_PKGSRC.openssl:M[yY][eE][sS]) |