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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B645613997D for ; Sun, 10 Nov 2019 23:06:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECEA7E097C; Sun, 10 Nov 2019 23:06:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2265E097C for ; Sun, 10 Nov 2019 23:06:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9302734CB5E for ; Sun, 10 Nov 2019 23:06:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E998890 for ; Sun, 10 Nov 2019 23:06:25 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1573427166.b03fe86b0421dc362423822f28eeae1105627238.mattst88@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.1d-r2.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b03fe86b0421dc362423822f28eeae1105627238 X-VCS-Branch: master Date: Sun, 10 Nov 2019 23:06:25 +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: 225d9925-b1a8-4d72-b568-a2cb6f9ca203 X-Archives-Hash: fc547f2e26f636141b4dca49fabd91d3 commit: b03fe86b0421dc362423822f28eeae1105627238 Author: Matt Turner gentoo org> AuthorDate: Sun Nov 10 23:05:30 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Nov 10 23:06:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03fe86b dev-libs/openssl: Allow eapply_user to modify gentoo.config Signed-off-by: Matt Turner gentoo.org> dev-libs/openssl/openssl-1.1.1d-r2.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-libs/openssl/openssl-1.1.1d-r2.ebuild b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild index 68fb0b3b5ad..1b8d0ea6945 100644 --- a/dev-libs/openssl/openssl-1.1.1d-r2.ebuild +++ b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild @@ -75,6 +75,10 @@ pkg_setup() { } src_prepare() { + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die + chmod a+rx gentoo.config || die + if use bindist; then mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die bash "${WORKDIR}"/hobble-openssl || die @@ -142,10 +146,6 @@ src_prepare() { # and 'make depend' uses -Werror for added fun (#417795 again) [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die - chmod a+rx gentoo.config || die - append-flags -fno-strict-aliasing append-flags $(test-flags-CC -Wa,--noexecstack) append-cppflags -DOPENSSL_NO_BUF_FREELISTS