Received: by mail.netbsd.org (Postfix, from userid 605) id A8F1984D4D; Sun, 24 Nov 2019 01:45:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 30F2784D3C for ; Sun, 24 Nov 2019 01:45:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 981eGUZkBqdm for ; Sun, 24 Nov 2019 01:45:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 86CE284CFD for ; Sun, 24 Nov 2019 01:45:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7A6F7FA97; Sun, 24 Nov 2019 01:45:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157455991253580" MIME-Version: 1.0 Date: Sun, 24 Nov 2019 01:45:12 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/security/openssl To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20191124014512.7A6F7FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157455991253580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Sun Nov 24 01:45:12 UTC 2019 Modified Files: pkgsrc/security/openssl: Makefile Log Message: 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.) To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 pkgsrc/security/openssl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157455991253580 Content-Disposition: inline Content-Length: 1289 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/openssl/Makefile diff -u pkgsrc/security/openssl/Makefile:1.244 pkgsrc/security/openssl/Makefile:1.245 --- pkgsrc/security/openssl/Makefile:1.244 Sat Nov 23 19:44:16 2019 +++ pkgsrc/security/openssl/Makefile Sun Nov 24 01:45:12 2019 @@ -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 --_----------=_157455991253580--