commit: 71654452a1a3503eee95858b125e1beb6ca34686
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 05:58:38 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 16:51:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71654452
dev-libs/openssl: drop sanity test from src_prepare
Configure doesn't do anything special when we pass --test-sanity to it;
it just ignores the option entirely.
Also move more configurey things to src_configure.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/openssl/openssl-3.0.8-r1.ebuild | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/dev-libs/openssl/openssl-3.0.8-r1.ebuild
b/dev-libs/openssl/openssl-3.0.8-r1.ebuild
index d809d357d0fb..33e696530c76 100644
--- a/dev-libs/openssl/openssl-3.0.8-r1.ebuild
+++ b/dev-libs/openssl/openssl-3.0.8-r1.ebuild
@@ -92,13 +92,6 @@ src_unpack() {
}
src_prepare() {
- # Allow openssl to be cross-compiled
- cp "${FILESDIR}"/gentoo.config-1.0.4 gentoo.config || die
- chmod a+rx gentoo.config || die
-
- # Keep this in sync with app-misc/c_rehash
- SSL_CNF_DIR="/etc/ssl"
-
# Make sure we only ever touch Makefile.org and avoid patching a file
# that gets blown away anyways by the Configure script in src_configure
rm -f Makefile
@@ -116,6 +109,13 @@ src_prepare() {
rm test/recipes/80-test_ssl_new.t || die
fi
+ multilib_copy_sources
+}
+
+src_configure() {
+ # Keep this in sync with app-misc/c_rehash
+ SSL_CNF_DIR="/etc/ssl"
+
# Quiet out unknown driver argument warnings since openssl
# doesn't have well-split CFLAGS and we're making it even worse
# and 'make depend' uses -Werror for added fun (bug #417795 again)
@@ -134,14 +134,6 @@ src_prepare() {
append-flags $(test-flags-CC -Wa,--noexecstack)
- local sslout=$(./gentoo.config)
- einfo "Using configuration: ${sslout:-(openssl knows best)}"
- edo perl Configure ${sslout} --test-sanity
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
# bug #197996
unset APPS
# bug #312551
@@ -151,6 +143,10 @@ multilib_src_configure() {
tc-export AR CC CXX RANLIB RC
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo
"Heimdal")
@@ -167,7 +163,7 @@ multilib_src_configure() {
# ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
#fi
- local sslout=$(./gentoo.config)
+ local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
einfo "Using configuration: ${sslout:-(openssl knows best)}"
#
https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
