| 1 |
commit: 0f78fddb808fee39d8ea63624f94b35863927b05 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 28 17:19:20 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 28 17:19:20 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0f78fddb |
| 7 |
|
| 8 |
dev-libs/openssl: fix build on sparc-solaris |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52.2-prefix, Repoman-2.3.12 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/openssl/files/gentoo.config-1.0.2 | 9 +++++++-- |
| 14 |
dev-libs/openssl/openssl-1.1.0i-r3.ebuild | 3 ++- |
| 15 |
2 files changed, 9 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.2 |
| 18 |
index a2d64d56c4..64933771ca 100755 |
| 19 |
--- a/dev-libs/openssl/files/gentoo.config-1.0.2 |
| 20 |
+++ b/dev-libs/openssl/files/gentoo.config-1.0.2 |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
#!/usr/bin/env bash |
| 23 |
-# Copyright 1999-2017 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $Id$ |
| 27 |
# |
| 28 |
@@ -157,7 +157,12 @@ solaris) |
| 29 |
i386) machine=x86-${compiler} ;; |
| 30 |
x86_64*) machine=x86_64-${compiler}; system=${system}64;; |
| 31 |
sparcv9*) machine=sparcv9-${compiler}; system=${system}64;; |
| 32 |
- sparc*) machine=sparcv8-${compiler};; |
| 33 |
+ sparc*) |
| 34 |
+ # this is a bit retarded, but openssl uses sparcv9 |
| 35 |
+ # with 32-bits to target the CPU specific features, |
| 36 |
+ # so we need to figure out if we do v9 here |
| 37 |
+ machine=$(isainfo -k)-${compiler} |
| 38 |
+ ;; |
| 39 |
esac |
| 40 |
;; |
| 41 |
mingwvc) |
| 42 |
|
| 43 |
diff --git a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild b/dev-libs/openssl/openssl-1.1.0i-r3.ebuild |
| 44 |
index 348a3a8a12..50b63a1a20 100644 |
| 45 |
--- a/dev-libs/openssl/openssl-1.1.0i-r3.ebuild |
| 46 |
+++ b/dev-libs/openssl/openssl-1.1.0i-r3.ebuild |
| 47 |
@@ -145,7 +145,8 @@ multilib_src_configure() { |
| 48 |
unset SCRIPTS #312551 |
| 49 |
unset CROSS_COMPILE #311473 |
| 50 |
|
| 51 |
- tc-export CC AR RANLIB RC |
| 52 |
+ tc-export CC AR RANLIB RC CPP |
| 53 |
+ # for CPP, see: https://github.com/openssl/openssl/issues/5867 |
| 54 |
|
| 55 |
# Clean out patent-or-otherwise-encumbered code |
| 56 |
# Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) |
Archives