Received: by mail.netbsd.org (Postfix, from userid 605) id B3C6784D7C; Tue, 11 Feb 2020 09:58:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3B4DE84D36 for ; Tue, 11 Feb 2020 09:58:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id e1r_2m0rIJoW for ; Tue, 11 Feb 2020 09:58:50 +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 915CA84D22 for ; Tue, 11 Feb 2020 09:58:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8B5AAFBF4; Tue, 11 Feb 2020 09:58:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158141513039580" MIME-Version: 1.0 Date: Tue, 11 Feb 2020 09:58:50 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/security/openssl To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20200211095850.8B5AAFBF4@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. --_----------=_158141513039580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Feb 11 09:58:50 UTC 2020 Modified Files: pkgsrc/security/openssl: Makefile Log Message: openssl: Handle i386 SunOS. The OpenSSL config script isn't clever enough to detect multiarch platforms so we need to manually specify the host OS. To generate a diff of this commit: cvs rdiff -u -r1.250 -r1.251 pkgsrc/security/openssl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158141513039580 Content-Disposition: inline Content-Length: 1084 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.250 pkgsrc/security/openssl/Makefile:1.251 --- pkgsrc/security/openssl/Makefile:1.250 Sat Jan 18 21:48:23 2020 +++ pkgsrc/security/openssl/Makefile Tue Feb 11 09:58:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.250 2020/01/18 21:48:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.251 2020/02/11 09:58:50 jperkin Exp $ DISTNAME= openssl-1.1.1d PKGREVISION= 2 @@ -27,6 +27,17 @@ CONFIGURE_ARGS+= shared CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} CONFIGURE_ENV+= PERL=${PERL5:Q} +# If the config script cannot guess the host system correctly then we need to +# specify it manually and call the Configure script directly. +OPENSSL_HOST.SunOS-i386= solaris-x86-gcc +OPENSSL_HOST.SunOS-x86_64= solaris64-x86-gcc + +.if defined(OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH}) +CONFIG_SHELL= ${PERL5} +CONFIGURE_SCRIPT= ./Configure +CONFIGURE_ARGS+= ${OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH}} +.endif + PKGCONFIG_OVERRIDE+= libcrypto.pc libssl.pc openssl.pc PKGCONFIG_OVERRIDE_STAGE= post-build --_----------=_158141513039580--