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 6767C138334 for ; Tue, 25 Dec 2018 17:24:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 171BBE08D0; Tue, 25 Dec 2018 17:24:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 E2C74E08D0 for ; Tue, 25 Dec 2018 17:24:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 40F7E335C3D for ; Tue, 25 Dec 2018 17:24:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35B694E7 for ; Tue, 25 Dec 2018 17:24:22 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1545758636.15d6fa4ce6547c18471e0e0a369bd390b64feedb.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/, dev-libs/openssl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch dev-libs/openssl/openssl-1.1.0j.ebuild X-VCS-Directories: dev-libs/openssl/ dev-libs/openssl/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 15d6fa4ce6547c18471e0e0a369bd390b64feedb X-VCS-Branch: master Date: Tue, 25 Dec 2018 17:24:22 +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: 41e8a687-b6f4-4a18-add1-6157a3e321f6 X-Archives-Hash: e355f0739500397214aa8e232d60e1f5 commit: 15d6fa4ce6547c18471e0e0a369bd390b64feedb Author: Lars Wendler gentoo org> AuthorDate: Tue Dec 25 17:23:56 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Dec 25 17:23:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d6fa4c dev-libs/openssl: Fixed parallel install Closes: https://bugs.gentoo.org/671602 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> .../files/openssl-1.1.0j-parallel_install_fix.patch | 21 +++++++++++++++++++++ dev-libs/openssl/openssl-1.1.0j.ebuild | 1 + 2 files changed, 22 insertions(+) diff --git a/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch b/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch new file mode 100644 index 00000000000..c837e208cf6 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch @@ -0,0 +1,21 @@ +https://github.com/openssl/openssl/issues/7679 + +--- a/Configurations/unix-Makefile.tmpl ++++ b/Configurations/unix-Makefile.tmpl +@@ -77,8 +77,14 @@ + # to. You're welcome. + sub dependmagic { + my $target = shift; +- +- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target"; ++ my $magic = <<"_____"; ++$target: build_generated depend ++ \$(MAKE) _$target ++_$target ++_____ ++ # Remove line ending ++ $magic =~ s|\R$||; ++ return $magic; + } + ''; + -} diff --git a/dev-libs/openssl/openssl-1.1.0j.ebuild b/dev-libs/openssl/openssl-1.1.0j.ebuild index e46218cc483..9394eac2532 100644 --- a/dev-libs/openssl/openssl-1.1.0j.ebuild +++ b/dev-libs/openssl/openssl-1.1.0j.ebuild @@ -56,6 +56,7 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 + "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 ) src_prepare() {