diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-12-25 18:23:56 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-12-25 18:23:56 +0100 |
| commit | 15d6fa4ce6547c18471e0e0a369bd390b64feedb (patch) | |
| tree | 01cf041aac9ac53448d1ba4142abe9f5e785ea91 | |
| parent | media-libs/libraw: Removed old. (diff) | |
| download | gentoo-15d6fa4ce6547c18471e0e0a369bd390b64feedb.tar.gz gentoo-15d6fa4ce6547c18471e0e0a369bd390b64feedb.tar.bz2 gentoo-15d6fa4ce6547c18471e0e0a369bd390b64feedb.zip | |
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 <polynomial-c@gentoo.org>
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch | 21 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.1.0j.ebuild | 1 |
2 files changed, 22 insertions, 0 deletions
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 000000000000..c837e208cf6a --- /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 e46218cc4838..9394eac25327 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() { |