commit: b03fe86b0421dc362423822f28eeae1105627238
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 23:05:30 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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