diff options
| author | gdt <gdt@pkgsrc.org> | 2019-11-24 01:45:12 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2019-11-24 01:45:12 +0000 |
| commit | 52d480b57abd2f1cfe8e05a98df4af76671b29a7 (patch) | |
| tree | eaf8b4467df8ef382d01e26bec6cbbb2d2d2d4c3 /security | |
| parent | 9cd7eca470325b8d619ec4ea0acb15acfddb99d9 (diff) | |
| download | pkgsrc-52d480b57abd2f1cfe8e05a98df4af76671b29a7.tar.gz | |
security/openssl: Fix recent use of empty()
Should resolve build on SmartOS.
(Amazingly, the wrong expression worked fine on NetbSD with gcc when
it was tested.)
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 3ecc963640f..2931278c033 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.244 2019/11/23 19:44:16 gdt Exp $ +# $NetBSD: Makefile,v 1.245 2019/11/24 01:45:12 gdt Exp $ DISTNAME= openssl-1.0.2s PKGREVISION= 1 @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= shared no-fips # Avoid dependency on 'makedepend' on platforms where the default CC is set # to 'cc' not 'gcc' in boostrap-mk-files. OpenSSL only supports the latter. -.if !empty(${PKGSRC_COMPILER:Mgcc}) && ${CC} == "cc" +.if !empty(PKGSRC_COMPILER:Mgcc) && ${CC} == "cc" CC= gcc .endif @@ -50,7 +50,7 @@ OPENSSL_MACHINE_ARCH= ${MACHINE_ARCH} # back to ./config's autodetection if not. . if defined(OPENSSL_MACHINE_ARCH) && !empty(OPENSSL_MACHINE_ARCH) CONFIGURE_SCRIPT= ./Configure -. if !empty(${PKGSRC_COMPILER:Mclang}) || !empty(${PKGSRC_COMPILER:Mgcc}) +. if !empty(PKGSRC_COMPILER:Mclang) || !empty(PKGSRC_COMPILER:Mgcc) CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-gcc . else CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-cc |