diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-09-06 01:30:02 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-09-08 13:32:12 -0700 |
| commit | 5ccc6fd2dabc6aa0454e45ca168a9eca3c983cba (patch) | |
| tree | 030015ed96dbb4df9afd0f724c921ffb8ee07f97 /meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch | |
| parent | 791a1c612f4bf36c6154e31cc80de868ff7e2c27 (diff) | |
| download | meta-openembedded-5ccc6fd2dabc6aa0454e45ca168a9eca3c983cba.tar.gz | |
python-m2crypto: Ignore WCHAR_MAX and WCHAR_MIN when on musl
This fixes the build until we upgrade to swig 4.0 where this is fixed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch')
| -rw-r--r-- | meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch b/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch index 931c25c8ee..7f6dd29f8a 100644 --- a/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch +++ b/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch | |||
| @@ -4,16 +4,19 @@ Index: M2Crypto-0.30.1/SWIG/_m2crypto.i | |||
| 4 | =================================================================== | 4 | =================================================================== |
| 5 | --- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i | 5 | --- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i |
| 6 | +++ M2Crypto-0.30.1/SWIG/_m2crypto.i | 6 | +++ M2Crypto-0.30.1/SWIG/_m2crypto.i |
| 7 | @@ -7,7 +7,7 @@ | 7 | @@ -8,6 +8,11 @@ |
| 8 | * Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved. | ||
| 9 | * | 8 | * |
| 10 | */ | 9 | */ |
| 11 | - | 10 | |
| 12 | +%import "gcc_macros.h" | 11 | +%import "gcc_macros.h" |
| 12 | + | ||
| 13 | +%ignore WCHAR_MAX; | ||
| 14 | +%ignore WCHAR_MIN; | ||
| 15 | + | ||
| 13 | %module(threads=1) m2crypto | 16 | %module(threads=1) m2crypto |
| 14 | /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere. | 17 | /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere. |
| 15 | Disable threadallow as well, only enable it for operations likely to | 18 | Disable threadallow as well, only enable it for operations likely to |
| 16 | @@ -15,11 +15,6 @@ | 19 | @@ -15,11 +20,6 @@ |
| 17 | %nothreadblock; | 20 | %nothreadblock; |
| 18 | %nothreadallow; | 21 | %nothreadallow; |
| 19 | 22 | ||
| @@ -25,3 +28,8 @@ Index: M2Crypto-0.30.1/SWIG/_m2crypto.i | |||
| 25 | %{ | 28 | %{ |
| 26 | #ifdef _WIN32 | 29 | #ifdef _WIN32 |
| 27 | #define _WINSOCKAPI_ | 30 | #define _WINSOCKAPI_ |
| 31 | @@ -95,4 +95,3 @@ static PyObject *x509_store_verify_cb_fu | ||
| 32 | %constant int encrypt = 1; | ||
| 33 | %constant int decrypt = 0; | ||
| 34 | #endif | ||
| 35 | - | ||
