From 5ccc6fd2dabc6aa0454e45ca168a9eca3c983cba Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Sep 2018 01:30:02 -0700 Subject: 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 --- .../python-m2crypto/m2crypto-0.26.4-gcc_macros.patch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch') 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 =================================================================== --- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i +++ M2Crypto-0.30.1/SWIG/_m2crypto.i -@@ -7,7 +7,7 @@ - * Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved. +@@ -8,6 +8,11 @@ * */ -- + +%import "gcc_macros.h" ++ ++%ignore WCHAR_MAX; ++%ignore WCHAR_MIN; ++ %module(threads=1) m2crypto /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere. Disable threadallow as well, only enable it for operations likely to -@@ -15,11 +15,6 @@ +@@ -15,11 +20,6 @@ %nothreadblock; %nothreadallow; @@ -25,3 +28,8 @@ Index: M2Crypto-0.30.1/SWIG/_m2crypto.i %{ #ifdef _WIN32 #define _WINSOCKAPI_ +@@ -95,4 +95,3 @@ static PyObject *x509_store_verify_cb_fu + %constant int encrypt = 1; + %constant int decrypt = 0; + #endif +- -- cgit 1.2.3-korg