summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch16
-rw-r--r--meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb (renamed from meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb)2
2 files changed, 8 insertions, 10 deletions
diff --git a/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch b/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
index d535e43261..3678d46cf6 100644
--- a/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
+++ b/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
@@ -1,4 +1,4 @@
1From d8db473ce9346cd6254c90e13ac45b3bbde494c4 Mon Sep 17 00:00:00 2001 1From 47ede0950740e8919c28774840e77f223d5f3124 Mon Sep 17 00:00:00 2001
2From: Derek Straka <derek@asterius.io> 2From: Derek Straka <derek@asterius.io>
3Date: Sun, 11 Mar 2018 19:55:38 -0400 3Date: Sun, 11 Mar 2018 19:55:38 -0400
4Subject: [PATCH] py-scrypt: remove the hard coded include paths 4Subject: [PATCH] py-scrypt: remove the hard coded include paths
@@ -11,16 +11,14 @@ Signed-off-by: Derek Straka <derek@asterius.io>
11 1 file changed, 1 deletion(-) 11 1 file changed, 1 deletion(-)
12 12
13diff --git a/setup.py b/setup.py 13diff --git a/setup.py b/setup.py
14index e36adc4..2ebfbf1 100644 14index 419a982..3f1fe52 100644
15--- a/setup.py 15--- a/setup.py
16+++ b/setup.py 16+++ b/setup.py
17@@ -24,7 +24,6 @@ if sys.platform.startswith('linux'): 17@@ -26,7 +26,6 @@ if sys.platform.startswith('linux'):
18 ('HAVE_SYS_SYSINFO_H', '1'), 18 ('_FILE_OFFSET_BITS', '64'),
19 ('_FILE_OFFSET_BITS', '64')] 19 ]
20 libraries = ['crypto', 'rt'] 20 libraries = ['crypto', 'rt']
21- includes = ['/usr/local/include', '/usr/include'] 21- includes = ['/usr/local/include', '/usr/include']
22 CFLAGS.append('-O2') 22 CFLAGS.append('-O2')
23 elif sys.platform.startswith('win32'): 23 elif sys.platform.startswith('win32') and os.environ.get('MSYSTEM'):
24 define_macros = [('inline', '__inline')] 24 msys2_env = os.getenv('MSYSTEM')
25--
262.7.4
diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb
index ce0d4de9c4..94c83e4952 100644
--- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb
+++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb
@@ -5,7 +5,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt"
5 5
6SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" 6SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch"
7 7
8SRC_URI[sha256sum] = "0d226c1c6744fb2e308b391410669b1df5cfe82637ffcb5ed489bf82b2d2eb78" 8SRC_URI[sha256sum] = "98ffde45e4a95461d73ded54ba7a26857679920d4f8ff320f6f7ade6e29531bd"
9 9
10inherit pypi ptest setuptools3 dos2unix 10inherit pypi ptest setuptools3 dos2unix
11 11