diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-07-07 23:50:26 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-07-07 23:50:26 +0000 |
| commit | a23e595d1218a7fe7839f61b8752c13f696210cf (patch) | |
| tree | 3e4ca130698cd07e5163e0bbf8293faef70212f6 /dev-libs | |
| parent | keyword ~x86-fbsd, bug #341969 (diff) | |
| download | gentoo-2-a23e595d1218a7fe7839f61b8752c13f696210cf.tar.gz gentoo-2-a23e595d1218a7fe7839f61b8752c13f696210cf.tar.bz2 gentoo-2-a23e595d1218a7fe7839f61b8752c13f696210cf.zip | |
add patch from Yuta SATOH to fix build on amd64-fbsd, bug #363089
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.0.0d-fbsd-amd64.patch | 12 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.0.0d.ebuild | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index b6b017f615a4..fff541c8c1f4 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.397 2011/07/05 07:01:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.398 2011/07/07 23:50:26 aballier Exp $ + + 07 Jul 2011; Alexis Ballier <aballier@gentoo.org> openssl-1.0.0d.ebuild, + +files/openssl-1.0.0d-fbsd-amd64.patch: + add patch from Yuta SATOH to fix build on amd64-fbsd, bug #363089 05 Jul 2011; Mike Frysinger <vapier@gentoo.org> -files/openssl-0.9.7e-gentoo.patch, openssl-0.9.8r.ebuild, diff --git a/dev-libs/openssl/files/openssl-1.0.0d-fbsd-amd64.patch b/dev-libs/openssl/files/openssl-1.0.0d-fbsd-amd64.patch new file mode 100644 index 000000000000..5b27ce5c3361 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.0.0d-fbsd-amd64.patch @@ -0,0 +1,12 @@ +Taken from http://rt.openssl.org/Ticket/Display.html?id=2440 + +--- crypto/sha/asm/sha512-x86_64.pl 2008-12-19 11:17:28.000000000 +0000 ++++ crypto/sha/asm/sha512-x86_64.pl 2011-01-15 23:33:13.000000000 +0000 +@@ -51,6 +51,7 @@ + ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or + die "can't locate x86_64-xlate.pl"; + ++close STDOUT; + open STDOUT,"| $^X $xlate $flavour $output"; + + if ($output =~ /512/) { diff --git a/dev-libs/openssl/openssl-1.0.0d.ebuild b/dev-libs/openssl/openssl-1.0.0d.ebuild index b9ef60f06261..bb9ea84b915f 100644 --- a/dev-libs/openssl/openssl-1.0.0d.ebuild +++ b/dev-libs/openssl/openssl-1.0.0d.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0d.ebuild,v 1.11 2011/07/05 07:01:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0d.ebuild,v 1.12 2011/07/07 23:50:26 aballier Exp $ EAPI="2" @@ -35,6 +35,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130 epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 epatch "${FILESDIR}"/${PN}-1.0.0d-alpha-typo.patch #364699 + epatch "${FILESDIR}"/${PN}-1.0.0d-fbsd-amd64.patch #363089 epatch_user #332661 # disable fips in the build |