diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-10-08 17:22:42 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-10-08 17:22:42 +0000 |
| commit | ad6536c3dbc284ea4cd8045dbdea32c18bb5d26e (patch) | |
| tree | 987a77bf4282a749abf89562bbdf83ea3cbb7d29 /dev-libs/openssl | |
| parent | Added ebuild for junrar - a java rar library (dependency of mucommander) (diff) | |
| download | gentoo-2-ad6536c3dbc284ea4cd8045dbdea32c18bb5d26e.tar.gz gentoo-2-ad6536c3dbc284ea4cd8045dbdea32c18bb5d26e.tar.bz2 gentoo-2-ad6536c3dbc284ea4cd8045dbdea32c18bb5d26e.zip | |
Fix parallel build failures when generating header files.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch | 17 |
2 files changed, 22 insertions, 1 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 4e6def312627..45c593822c68 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.490 2013/09/23 06:03:30 jmorgan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.491 2013/10/08 17:22:42 vapier Exp $ + + 08 Oct 2013; Mike Frysinger <vapier@gentoo.org> + files/openssl-1.0.1-parallel-build.patch: + Fix parallel build failures when generating header files. 23 Sep 2013; Jack Morgan <jmorgan@gentoo.org> openssl-1.0.1e-r1.ebuild: removing ppc64 openssl-1.0.1e-r1 wrt bug #469976 diff --git a/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch index 7c804b543205..19f859abb210 100644 --- a/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch +++ b/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch @@ -335,3 +335,20 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 # DO NOT DELETE THIS LINE -- make depend depends on it. +--- a/crypto/objects/Makefile ++++ b/crypto/objects/Makefile +@@ -44,11 +44,11 @@ obj_dat.h: obj_dat.pl obj_mac.h + # objects.pl both reads and writes obj_mac.num + obj_mac.h: objects.pl objects.txt obj_mac.num + $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h +- @sleep 1; touch obj_mac.h; sleep 1 + +-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num ++# This doesn't really need obj_mac.h, but since that rule reads & writes ++# obj_mac.num, we can't run in parallel with it. ++obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h + $(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h +- @sleep 1; touch obj_xref.h; sleep 1 + + files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |