CVS commit: pkgsrc/security/openssl

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Feb 11 17:23:11 UTC 2020

Modified Files:
        pkgsrc/security/openssl: Makefile

Log Message:
security/openssl: fix build on Solaris

This fixes PR pkg/54894.


To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 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.251 pkgsrc/security/openssl/Makefile:1.252
--- pkgsrc/security/openssl/Makefile:1.251      Tue Feb 11 09:58:50 2020
+++ pkgsrc/security/openssl/Makefile    Tue Feb 11 17:23:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.251 2020/02/11 09:58:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.252 2020/02/11 17:23:11 rillig Exp $
 
 DISTNAME=      openssl-1.1.1d
 PKGREVISION=   2
@@ -61,6 +61,14 @@ PLIST_SUBST+=                SOEXT=${SOEXT}
 
 PRINT_PLIST_AWK+=      /^lib\/engines/ { gsub(/\.${SOEXT}$$/, ".$${SOEXT}"); }
 
+# Remove CC from the environment, to fix GCC version handling on HP-UX,
+# SunOS and Linux/sparc.
+#
+# See https://github.com/openssl/openssl/issues/11060.
+do-configure:
+       ${RUN} cd ${WRKSRC} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV:NCC=}  \
+               ${CONFIG_SHELL} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+
 #
 # Get rid of ridiculous namespace collisions like passwd.1 and just leave the
 # openssl-*.1 style variants.  On a more practical note this avoids creating