dev-libs/openssl: use edo.eclass in 1.1.1o

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-05-28 04:11:37 +01:00
parent a0f6c8a85d
commit b0356a26e7

View File

@@ -3,7 +3,7 @@
EAPI="7"
inherit flag-o-matic toolchain-funcs multilib-minimal verify-sig
inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
MY_P=${P/_/-}
@@ -160,7 +160,6 @@ multilib_src_configure() {
tc-export CC AR RANLIB RC
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
echoit() { echo "$@" ; "$@" ; }
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
@@ -182,8 +181,7 @@ multilib_src_configure() {
# Don't set it without thorough revdeps testing.
# Make sure user flags don't get added *yet* to avoid duplicated
# flags.
CFLAGS= LDFLAGS= echoit \
./${config} \
CFLAGS= LDFLAGS= edo ./${config} \
${sslout} \
$(use cpu_flags_x86_sse2 || echo "no-sse2") \
enable-camellia \
@@ -208,8 +206,7 @@ multilib_src_configure() {
--prefix="${EPREFIX}"/usr \
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
--libdir=$(get_libdir) \
shared threads \
|| die
shared threads
# Clean out hardcoded flags that openssl uses
local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \