summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2019-10-15 08:53:23 +0000
committerArmin Kuster <akuster808@gmail.com>2019-10-19 08:15:32 -0700
commit59475ff3927faad212816c1894c140ffae1eeabf (patch)
tree4907b494c22e10ad118214959365c016fc242979
parentcba875fdac3081137d8b33ee7fb5dc9e8d7818da (diff)
downloadmeta-openembedded-59475ff3927faad212816c1894c140ffae1eeabf.tar.gz
python3-twofish: Fix missing return statements in module stubs
* fixes build with -Werror=return-type twofish.c: In function 'init_twofish': twofish.c:45:1: error: control reaches end of non-void function [-Werror=return-type] 45 | PyMODINIT_FUNC init_twofish(void) { } | ^~~~~~~~~~~~~~ twofish.c: In function 'PyInit__twofish': twofish.c:46:1: error: control reaches end of non-void function [-Werror=return-type] 46 | PyMODINIT_FUNC PyInit__twofish(void) { } | ^~~~~~~~~~~~~~ cc1: some warnings being treated as errors Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch38
-rw-r--r--meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb2
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch b/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch
new file mode 100644
index 000000000..c25b2457e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-twofish/0001-Fix-missing-return-statements-in-module-stubs.patch
@@ -0,0 +1,38 @@
1From 5704610f4b3aed5210e9c5b7c05ff8b5b2364c9c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 12 Aug 2019 08:18:21 +0000
4Subject: [PATCH] Fix missing return statements in module stubs
5
6* fixes build with -Werror=return-type
7 twofish.c: In function 'init_twofish':
8 twofish.c:45:1: error: control reaches end of non-void function [-Werror=return-type]
9 45 | PyMODINIT_FUNC init_twofish(void) { }
10 | ^~~~~~~~~~~~~~
11 twofish.c: In function 'PyInit__twofish':
12 twofish.c:46:1: error: control reaches end of non-void function [-Werror=return-type]
13 46 | PyMODINIT_FUNC PyInit__twofish(void) { }
14 | ^~~~~~~~~~~~~~
15 cc1: some warnings being treated as errors
16
17Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18
19Upstream-Status: Submitted [https://github.com/keybase/python-twofish/pull/6]
20---
21 twofish.c | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/twofish.c b/twofish.c
25index e324c34..d4487d8 100644
26--- a/twofish.c
27+++ b/twofish.c
28@@ -42,5 +42,5 @@ DL_EXPORT(void) exp_Twofish_decrypt(Twofish_key * xkey, uint8_t c[16], uint8_t p
29 We need a stub init_twofish function so the module will link as a proper module.
30 Do not import _twofish from python; it will not work since _twofish is not a *real* module
31 */
32-PyMODINIT_FUNC init_twofish(void) { }
33-PyMODINIT_FUNC PyInit__twofish(void) { }
34+PyMODINIT_FUNC init_twofish(void) { return NULL; }
35+PyMODINIT_FUNC PyInit__twofish(void) { return NULL; }
36--
372.17.1
38
diff --git a/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb b/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
index e593f6f21..7b8eb2ef0 100644
--- a/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
@@ -1,2 +1,4 @@
1require python-twofish.inc 1require python-twofish.inc
2inherit setuptools3 2inherit setuptools3
3
4SRC_URI += "file://0001-Fix-missing-return-statements-in-module-stubs.patch"