diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-05-16 07:19:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-05-16 07:19:17 +0000 |
| commit | 4fefc97022783f51d405f4aafac035d814094cf6 (patch) | |
| tree | 83381fcbed07623ef13bcbb801c5598ed1dc5408 /dev-python/pycrypto | |
| parent | update SRC_URI (bug #547796) (diff) | |
| download | gentoo-2-4fefc97022783f51d405f4aafac035d814094cf6.tar.gz gentoo-2-4fefc97022783f51d405f4aafac035d814094cf6.tar.bz2 gentoo-2-4fefc97022783f51d405f4aafac035d814094cf6.zip | |
Fix from Chromium OS for cross-compiling.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-python/pycrypto')
| -rw-r--r-- | dev-python/pycrypto/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch | 13 | ||||
| -rw-r--r-- | dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog index 69bb8875d7fb..d35dc55cd05e 100644 --- a/dev-python/pycrypto/ChangeLog +++ b/dev-python/pycrypto/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pycrypto # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.161 2015/04/08 08:05:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.162 2015/05/16 07:19:17 vapier Exp $ + + 16 May 2015; Mike Frysinger <vapier@gentoo.org> + +files/pycrypto-2.6.1-cross-compile.patch, pycrypto-2.6.1-r1.ebuild: + Fix from Chromium OS for cross-compiling. 08 Apr 2015; Michał Górny <mgorny@gentoo.org> pycrypto-2.6.1.ebuild: Drop old Python implementations diff --git a/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch b/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch new file mode 100644 index 000000000000..2ce24a49cc71 --- /dev/null +++ b/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch @@ -0,0 +1,13 @@ +do not hardcode -I/usr/include as it's useless and breaks cross-compiles + +--- a/setup.py ++++ b/setup.py +@@ -370,7 +370,7 @@ kw = {'name':"pycrypto", + 'ext_modules': plat_ext + [ + # _fastmath (uses GNU mp library) + Extension("Crypto.PublicKey._fastmath", +- include_dirs=['src/','/usr/include/'], ++ include_dirs=['src/'], + libraries=['gmp'], + sources=["src/_fastmath.c"]), + diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild index de60020a2489..0da77cf774d7 100644 --- a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild +++ b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild,v 1.2 2014/12/11 09:28:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild,v 1.3 2015/05/16 07:19:17 vapier Exp $ EAPI=5 @@ -25,6 +25,7 @@ DEPEND="${RDEPEND} )" python_prepare_all() { + epatch "${FILESDIR}"/${P}-cross-compile.patch # Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3 # https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a sed \ |