pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/openssl security/openssl: Fix recent use of e...
details: https://anonhg.NetBSD.org/pkgsrc/rev/59751cda6a86
branches: trunk
changeset: 344644:59751cda6a86
user: gdt <gdt%pkgsrc.org@localhost>
date: Sun Nov 24 01:45:12 2019 +0000
description:
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:
security/openssl/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r cbe3d6b32a10 -r 59751cda6a86 security/openssl/Makefile
--- a/security/openssl/Makefile Sun Nov 24 01:31:38 2019 +0000
+++ b/security/openssl/Makefile Sun Nov 24 01:45:12 2019 +0000
@@ -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 @@
# 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 @@
# 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
Home |
Main Index |
Thread Index |
Old Index