[oe-commits] [meta-openembedded] 21/44: pycrypto: Add recipe to have support on python3

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master
in repository meta-openembedded.

commit c06be20b249d023849726ee752b76816ccf2e9f4
Author: Ricardo Silva <rjpdasilva at gmail.com>
AuthorDate: Thu Jan 4 18:13:46 2018 +0000

    pycrypto: Add recipe to have support on python3
    
    The pycrypto module sources can be used for both python2 and python3,
    but a recipe for python3 was missing, so add it.
    
    Additionally, since the sources (and thus the patches) are shared
    between both versions, move the SRC_URI (same on both recipes) to the
    common 'python-pycrypto.inc' file, to avoid duplication.
    
    Also, to use the same patch files for both python2 and python3 without
    having to duplicate them over 2 folders, change 'python-pycrypto.inc' so
    that FILESEXTRAPATHS is prepended with the 'python-pycrypto' local dir
    for both versions instead of having that dir named after the package
    name '${PN}'.
    
    The python3 recipe is basically the same as for python2, but using
    distutils3 instead.
    
    Signed-off-by: Ricardo Silva <rjpdasilva at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-python/recipes-devtools/python/python-pycrypto.inc           | 6 +++++-
 meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb      | 4 ----
 .../{python-pycrypto_2.6.1.bb => python3-pycrypto_2.6.1.bb}       | 8 ++------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-pycrypto.inc b/meta-python/recipes-devtools/python/python-pycrypto.inc
index fb2c17d..232cdb7 100644
--- a/meta-python/recipes-devtools/python/python-pycrypto.inc
+++ b/meta-python/recipes-devtools/python/python-pycrypto.inc
@@ -3,12 +3,16 @@ HOMEPAGE = "http://www.pycrypto.org/"
 LICENSE = "PSFv2"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35f354d199e8cb7667b059a23578e63d"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycrypto:"
 
 DEPENDS += " gmp"
 
 inherit pypi autotools-brokensep
 
+SRC_URI += "file://cross-compiling.patch \
+            file://CVE-2013-7459.patch \
+           "
+
 SRC_URI[md5sum] = "55a61a054aa66812daf5161a0d5d7eda"
 SRC_URI[sha256sum] = "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c"
 
diff --git a/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb b/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb
index 919f91e..e13db01 100644
--- a/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb
+++ b/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb
@@ -1,10 +1,6 @@
 inherit distutils
 require python-pycrypto.inc
 
-SRC_URI += "file://cross-compiling.patch \
-            file://CVE-2013-7459.patch \
-           "
-
 # We explicitly call distutils_do_install, since we want it to run, but
 # *don't* want the autotools install to run, since this package doesn't
 # provide a "make install" target.
diff --git a/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb b/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
similarity index 60%
copy from meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb
copy to meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
index 919f91e..02d634c 100644
--- a/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
@@ -1,13 +1,9 @@
-inherit distutils
+inherit distutils3
 require python-pycrypto.inc
 
-SRC_URI += "file://cross-compiling.patch \
-            file://CVE-2013-7459.patch \
-           "
-
 # We explicitly call distutils_do_install, since we want it to run, but
 # *don't* want the autotools install to run, since this package doesn't
 # provide a "make install" target.
 do_install() {
-       distutils_do_install
+       distutils3_do_install
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.