[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/files/, dev-libs/openssl/

[Fabian Groffen]

commit:     0f78fddb808fee39d8ea63624f94b35863927b05
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 17:19:20 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 17:19:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0f78fddb

dev-libs/openssl: fix build on sparc-solaris

Package-Manager: Portage-2.3.52.2-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-libs/openssl/files/gentoo.config-1.0.2 | 9 +++++++--
 dev-libs/openssl/openssl-1.1.0i-r3.ebuild  | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 
b/dev-libs/openssl/files/gentoo.config-1.0.2
index a2d64d56c4..64933771ca 100755
--- a/dev-libs/openssl/files/gentoo.config-1.0.2
+++ b/dev-libs/openssl/files/gentoo.config-1.0.2
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
@@ -157,7 +157,12 @@ solaris)
                i386)         machine=x86-${compiler} ;;
                x86_64*)      machine=x86_64-${compiler}; system=${system}64;;
                sparcv9*)     machine=sparcv9-${compiler}; system=${system}64;;
-               sparc*)       machine=sparcv8-${compiler};;
+               sparc*)
+                       # this is a bit retarded, but openssl uses sparcv9
+                       # with 32-bits to target the CPU specific features,
+                       # so we need to figure out if we do v9 here
+                       machine=$(isainfo -k)-${compiler}
+                       ;;
        esac
        ;;
 mingwvc)

diff --git a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild 
b/dev-libs/openssl/openssl-1.1.0i-r3.ebuild
index 348a3a8a12..50b63a1a20 100644
--- a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0i-r3.ebuild
@@ -145,7 +145,8 @@ multilib_src_configure() {
        unset SCRIPTS #312551
        unset CROSS_COMPILE #311473
 
-       tc-export CC AR RANLIB RC
+       tc-export CC AR RANLIB RC CPP
+       # for CPP, see: https://github.com/openssl/openssl/issues/5867
 
        # Clean out patent-or-otherwise-encumbered code
        # Camellia: Royalty Free            
https://en.wikipedia.org/wiki/Camellia_(cipher)