diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-02-25 14:37:15 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-02-25 14:40:42 -0800 |
| commit | e3dec9bf2da04ace6b2e999ff779d117beb65e6e (patch) | |
| tree | ee4b7c9d95f10feb99094d9bc8761805a6112a1b /dev-libs/openssl | |
| parent | toolchain.eclass: update default live branches (diff) | |
| download | gentoo-e3dec9bf2da04ace6b2e999ff779d117beb65e6e.tar.gz gentoo-e3dec9bf2da04ace6b2e999ff779d117beb65e6e.tar.bz2 gentoo-e3dec9bf2da04ace6b2e999ff779d117beb65e6e.zip | |
dev-libs/openssl: Fix the build on alpha
Closes: https://bugs.gentoo.org/697840
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch | 42 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.1.1d-r3.ebuild | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch b/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch new file mode 100644 index 000000000000..3771684b2517 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch @@ -0,0 +1,42 @@ +From 19ded1a717b6c72c3db241f06787a353f1190755 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Tue, 18 Feb 2020 10:08:27 -0800 +Subject: [PATCH] config: Drop linux-alpha-gcc+bwx + +Its entry in Configuration/10-main.conf was dropped in commit +7ead0c89185c ("Configure: fold related configurations more aggressively +and clean-up.") probably because all but one of its bn_ops were removed +(RC4_CHAR remained). Benchmarks on an Alpha EV7 indicate that RC4_INT is +better than RC4_CHAR so rather than restoring the configuation, remove +it from config. + +CLA: trivial +Bug: https://bugs.gentoo.org/697840 + +Reviewed-by: Paul Dale <paul.dale@oracle.com> +Reviewed-by: Matt Caswell <matt@openssl.org> +Reviewed-by: Richard Levitte <levitte@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/11130) +--- + config | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/config b/config +index 2213969f90..e39481ca2a 100755 +--- a/config ++++ b/config +@@ -498,10 +498,7 @@ case "$GUESSOS" in + OUT="ios64-cross" ;; + alpha-*-linux2) + ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` +- case ${ISA:-generic} in +- *[678]) OUT="linux-alpha+bwx-$CC" ;; +- *) OUT="linux-alpha-$CC" ;; +- esac ++ OUT="linux-alpha-$CC" + if [ "$CC" = "gcc" ]; then + case ${ISA:-generic} in + EV5|EV45) __CNF_CFLAGS="$__CNF_CFLAGS -mcpu=ev5" +-- +2.24.1 + diff --git a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild index 8800d05fac78..97a1002fac78 100644 --- a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild +++ b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild @@ -50,6 +50,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-zlib.patch "${FILESDIR}"/${P}-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch "${FILESDIR}"/${P}-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch + "${FILESDIR}"/${P}-config-Drop-linux-alpha-gcc-bwx.patch ) S="${WORKDIR}/${MY_P}" |