diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-11-04 12:24:24 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-11-04 12:24:24 +0000 |
| commit | 696e6993bd373ed9feeb584ca3da05c86d138b8a (patch) | |
| tree | 583dec6937bd14ee9fcffe6d0384a9adb2bf93ab /dev-libs/botan | |
| parent | Remove old. (diff) | |
| download | gentoo-2-696e6993bd373ed9feeb584ca3da05c86d138b8a.tar.gz gentoo-2-696e6993bd373ed9feeb584ca3da05c86d138b8a.tar.bz2 gentoo-2-696e6993bd373ed9feeb584ca3da05c86d138b8a.zip | |
Fix building with sys-devel/binutils-2.20.51.0.2 (bug #291785).
(Portage version: 14775-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/botan')
| -rw-r--r-- | dev-libs/botan/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/botan/botan-1.8.8.ebuild | 8 | ||||
| -rw-r--r-- | dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch | 29 |
3 files changed, 41 insertions, 3 deletions
diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog index 5600837d924c..d1111043d981 100644 --- a/dev-libs/botan/ChangeLog +++ b/dev-libs/botan/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/botan # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.50 2009/11/03 21:39:26 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.51 2009/11/04 12:24:23 arfrever Exp $ + + 04 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + botan-1.8.8.ebuild, + +files/botan-1.8.8-use_negative_lea_displacement.patch: + Fix building with sys-devel/binutils-2.20.51.0.2 (bug #291785). *botan-1.8.8 (03 Nov 2009) diff --git a/dev-libs/botan/botan-1.8.8.ebuild b/dev-libs/botan/botan-1.8.8.ebuild index 712f5b505d53..8e85dcc671a2 100644 --- a/dev-libs/botan/botan-1.8.8.ebuild +++ b/dev-libs/botan/botan-1.8.8.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8.ebuild,v 1.1 2009/11/03 21:39:26 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8.ebuild,v 1.2 2009/11/04 12:24:23 arfrever Exp $ EAPI="2" -inherit multilib toolchain-funcs +inherit eutils multilib toolchain-funcs MY_PN="Botan" MY_P="${MY_PN}-${PV}" @@ -27,6 +27,10 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) DEPEND="${RDEPEND} >=dev-lang/python-2.4" +src_prepare() { + epatch "${FILESDIR}/${P}-use_negative_lea_displacement.patch" +} + src_configure() { local disable_modules="proc_walk,unix_procs,cpu_counter" diff --git a/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch b/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch new file mode 100644 index 000000000000..50faa56bdca3 --- /dev/null +++ b/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch @@ -0,0 +1,29 @@ +# +# old_revision [a101c8c86b755a666c72baf03154230e09e0667e] +# +# patch "src/hash/sha1_amd64/sha1_amd64_imp.S" +# from [dd263db10309950dec501dd9257a8df43cf6c6aa] +# to [ab1db7a394b41a1d3b9a63a6e8e1571e4671b962] +# +============================================================ +--- src/hash/sha1_amd64/sha1_amd64_imp.S dd263db10309950dec501dd9257a8df43cf6c6aa ++++ src/hash/sha1_amd64/sha1_amd64_imp.S ab1db7a394b41a1d3b9a63a6e8e1571e4671b962 +@@ -103,10 +103,16 @@ ALIGN; + + subq $320, W + ++/* ++* Using negative values for SHA-1 constants > 2^31 to work around ++* a bug in binutils not accepting large lea displacements. ++* -0x70E44324 == 0x8F1BBCDC ++* -0x359D3E2A == 0xCA62C1D6 ++*/ + #define MAGIC1 0x5A827999 + #define MAGIC2 0x6ED9EBA1 +-#define MAGIC3 0x8F1BBCDC +-#define MAGIC4 0xCA62C1D6 ++#define MAGIC3 -0x70E44324 ++#define MAGIC4 -0x359D3E2A + + #define T %esi + #define T2 %eax |