From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 731FA158090 for ; Sat, 28 May 2022 03:38:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44CCFE0863; Sat, 28 May 2022 03:38:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D197CE0864 for ; Sat, 28 May 2022 03:38:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06A2F3414BE for ; Sat, 28 May 2022 03:38:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4B3D3AA for ; Sat, 28 May 2022 03:38:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1653709083.b0356a26e7f91315a692202dbd9e890c30cde87e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/openssl-1.1.1o.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b0356a26e7f91315a692202dbd9e890c30cde87e X-VCS-Branch: master Date: Sat, 28 May 2022 03:38:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: daa0b0aa-9e78-4ce8-a13c-50589500584b X-Archives-Hash: 2606b3bb673a1140f45b90151065c375 commit: b0356a26e7f91315a692202dbd9e890c30cde87e Author: Sam James gentoo org> AuthorDate: Sat May 28 03:11:37 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 28 03:38:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0356a26 dev-libs/openssl: use edo.eclass in 1.1.1o Signed-off-by: Sam James gentoo.org> dev-libs/openssl/openssl-1.1.1o.ebuild | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dev-libs/openssl/openssl-1.1.1o.ebuild b/dev-libs/openssl/openssl-1.1.1o.ebuild index d31226dd3168..78897bc1821c 100644 --- a/dev-libs/openssl/openssl-1.1.1o.ebuild +++ b/dev-libs/openssl/openssl-1.1.1o.ebuild @@ -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 \