aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2018-03-11 20:04:48 -0400
committerArmin Kuster <akuster808@gmail.com>2018-03-16 19:27:54 -0700
commite03f5fd9a750be521e76e961165203626646f99f (patch)
treebe8239b8aed647c84d0c1774331927158f09e328
parentc35e3eba074cf9e8441e77a72dddc7d9b1e2e796 (diff)
downloadmeta-openembedded-contrib-e03f5fd9a750be521e76e961165203626646f99f.tar.gz
meta-openembedded-contrib-e03f5fd9a750be521e76e961165203626646f99f.tar.bz2
meta-openembedded-contrib-e03f5fd9a750be521e76e961165203626646f99f.zip
python-scrypt: update to version 0.8.6
Add patch to fix host include paths used Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-python/recipes-devtools/python/python-scrypt.inc8
-rw-r--r--meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch26
-rw-r--r--meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb (renamed from meta-python/recipes-devtools/python/python-scrypt_0.8.0.bb)0
-rw-r--r--meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb (renamed from meta-python/recipes-devtools/python/python3-scrypt_0.8.0.bb)0
4 files changed, 32 insertions, 2 deletions
diff --git a/meta-python/recipes-devtools/python/python-scrypt.inc b/meta-python/recipes-devtools/python/python-scrypt.inc
index 85f1d277bd..783d05b7e7 100644
--- a/meta-python/recipes-devtools/python/python-scrypt.inc
+++ b/meta-python/recipes-devtools/python/python-scrypt.inc
@@ -3,8 +3,12 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378"
HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/overview"
-SRC_URI[md5sum] = "0704e59cc3afb3845c27bb3827baeea9"
-SRC_URI[sha256sum] = "d4a5a4f53450b8ef629bbf1ee4be6105c69936e49b3d8bc621ac2287f0c86020"
+FILESEXTRAPATHS_prepend := "${THISDIR}/python-scrypt:"
+
+SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch"
+
+SRC_URI[md5sum] = "ae8e3263aa31b040c1f9c7f1e1843a56"
+SRC_URI[sha256sum] = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d"
inherit pypi
diff --git a/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch b/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
new file mode 100644
index 0000000000..d535e43261
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
@@ -0,0 +1,26 @@
+From d8db473ce9346cd6254c90e13ac45b3bbde494c4 Mon Sep 17 00:00:00 2001
+From: Derek Straka <derek@asterius.io>
+Date: Sun, 11 Mar 2018 19:55:38 -0400
+Subject: [PATCH] py-scrypt: remove the hard coded include paths
+
+Upstream-Status: Pending
+
+Signed-off-by: Derek Straka <derek@asterius.io>
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index e36adc4..2ebfbf1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -24,7 +24,6 @@ if sys.platform.startswith('linux'):
+ ('HAVE_SYS_SYSINFO_H', '1'),
+ ('_FILE_OFFSET_BITS', '64')]
+ libraries = ['crypto', 'rt']
+- includes = ['/usr/local/include', '/usr/include']
+ CFLAGS.append('-O2')
+ elif sys.platform.startswith('win32'):
+ define_macros = [('inline', '__inline')]
+--
+2.7.4
diff --git a/meta-python/recipes-devtools/python/python-scrypt_0.8.0.bb b/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb
index 9fbd00e049..9fbd00e049 100644
--- a/meta-python/recipes-devtools/python/python-scrypt_0.8.0.bb
+++ b/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb
diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.0.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb
index f49665322e..f49665322e 100644
--- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb