diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-09-23 22:28:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-09-23 22:28:11 +0000 |
| commit | 440908ebcbc3e62f3f742cb67668881b4e160ebe (patch) | |
| tree | 9adc43f8c85b08943475a8610481b07865473820 /dev-libs/libgcrypt | |
| parent | Revert return value on failure. (diff) | |
| download | gentoo-2-440908ebcbc3e62f3f742cb67668881b4e160ebe.tar.gz gentoo-2-440908ebcbc3e62f3f742cb67668881b4e160ebe.tar.bz2 gentoo-2-440908ebcbc3e62f3f742cb67668881b4e160ebe.zip | |
Fix building for x32 ABIs #427726 by Joe.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libgcrypt')
| -rw-r--r-- | dev-libs/libgcrypt/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch | 10 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog index b80bbaa677ad..bbdef1849a19 100644 --- a/dev-libs/libgcrypt/ChangeLog +++ b/dev-libs/libgcrypt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libgcrypt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.161 2012/08/19 16:59:12 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.162 2012/09/23 22:28:11 vapier Exp $ + + 23 Sep 2012; Mike Frysinger <vapier@gentoo.org> + +files/libgcrypt-1.5.0-x32.patch, libgcrypt-1.5.0-r2.ebuild: + Fix building for x32 ABIs #427726 by Joe. 19 Aug 2012; Raúl Porcel <armin76@gentoo.org> libgcrypt-1.5.0-r2.ebuild: alpha/ia64/m68k/s390/sh/sparc stable wrt #418391 diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch new file mode 100644 index 000000000000..5d39346844bf --- /dev/null +++ b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-x32.patch @@ -0,0 +1,10 @@ +http://lists.gnupg.org/pipermail/gcrypt-devel/2012-September/001979.html +https://bugs.gentoo.org/427726 + +--- mpi/amd64/mpi-asm-defs.h ++++ mpi/amd64/mpi-asm-defs.h +@@ -0,0 +1,4 @@ ++/* This file defines some basic constants for the MPI machinery. We ++ * need to define the types on a per-CPU basis, so it is done with ++ * this file here. */ ++#define BYTES_PER_MPI_LIMB 8 diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild index ff28463affa9..bc63d5016919 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild,v 1.9 2012/08/19 16:59:12 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild,v 1.10 2012/09/23 22:28:11 vapier Exp $ EAPI="4" @@ -24,6 +24,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) src_prepare() { epatch "${FILESDIR}"/${P}-uscore.patch + epatch "${FILESDIR}"/${PN}-1.5.0-x32.patch epatch "${FILESDIR}"/${PN}-multilib-syspath.patch epatch "${WORKDIR}"/${P}-idea.patch eautoreconf |