diff options
| author | ghen <ghen> | 2008-01-09 17:14:10 +0000 |
|---|---|---|
| committer | ghen <ghen> | 2008-01-09 17:14:10 +0000 |
| commit | 7f75c5508460ed0c2af2bf36e5bbb9d14831d260 (patch) | |
| tree | ca8744acc22b39dda1035c576d7f812a1d7d89e0 | |
| parent | aa9910dff78c31d6216b70df8f7669a8baa1751b (diff) | |
| download | pkgsrc-7f75c5508460ed0c2af2bf36e5bbb9d14831d260.tar.gz | |
Pullup ticket 2257 - requested by joerg
build fix for openssl
- pkgsrc/security/openssl/builtin.mk 1.24
Module Name: pkgsrc
Committed By: joerg
Date: Mon Jan 7 15:51:08 UTC 2008
Modified Files:
pkgsrc/security/openssl: builtin.mk
Log Message:
Fix builtin.mk logic for thread feature if no native OpenSSL exists.
Fixes PR pkg/37699 from Aleksey Cheusov.
| -rw-r--r-- | security/openssl/builtin.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk index 5a48be954cd..bdb312f4603 100644 --- a/security/openssl/builtin.mk +++ b/security/openssl/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.22 2007/09/07 17:26:23 jlam Exp $ +# $NetBSD: builtin.mk,v 1.22.4.1 2008/01/09 17:14:10 ghen Exp $ BUILTIN_PKG:= openssl @@ -136,7 +136,8 @@ USE_BUILTIN.openssl!= \ . endif . endfor . endif -. if defined(USE_FEATURES.openssl) +. if !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \ + defined(USE_FEATURES.openssl) . if !empty(USE_FEATURES.openssl:Mthreads) && \ !empty(BUILTIN_OPENSSL_HAS_THREADS:M[nN][oO]) USE_BUILTIN.openssl= no |