CVS commit: pkgsrc/security/openssl

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.

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