mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-04-20 11:38:34 +00:00
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>
This commit is contained in:
@@ -19,10 +19,11 @@ inherit pypi siteinfo
|
|||||||
DEPENDS += "openssl swig-native"
|
DEPENDS += "openssl swig-native"
|
||||||
RDEPENDS_${PN} += "python-typing"
|
RDEPENDS_${PN} += "python-typing"
|
||||||
|
|
||||||
DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_DIR_HOST} -I${STAGING_INCDIR}"
|
DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}"
|
||||||
DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_DIR_HOST}"
|
DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}"
|
||||||
|
|
||||||
SWIG_FEATURES_x86 = "-D__i386__"
|
SWIG_FEATURES_x86 = "-D__i386__"
|
||||||
|
SWIG_FEATURES_x32 = "-D__ILP32__"
|
||||||
SWIG_FEATURES ?= "-D__${HOST_ARCH}__"
|
SWIG_FEATURES ?= "-D__${HOST_ARCH}__"
|
||||||
export SWIG_FEATURES
|
export SWIG_FEATURES
|
||||||
|
|
||||||
@@ -51,7 +52,3 @@ do_configure_prepend() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
# http://errors.yoctoproject.org/Errors/Details/184714/
|
|
||||||
# SWIG/_m2crypto.i:10: Error: Unable to find 'gcc_macros.h'
|
|
||||||
CLEANBROKEN = "1"
|
|
||||||
|
|||||||
@@ -4,16 +4,19 @@ Index: M2Crypto-0.30.1/SWIG/_m2crypto.i
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i
|
--- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i
|
||||||
+++ M2Crypto-0.30.1/SWIG/_m2crypto.i
|
+++ M2Crypto-0.30.1/SWIG/_m2crypto.i
|
||||||
@@ -7,7 +7,7 @@
|
@@ -8,6 +8,11 @@
|
||||||
* Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
|
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
-
|
|
||||||
+%import "gcc_macros.h"
|
+%import "gcc_macros.h"
|
||||||
|
+
|
||||||
|
+%ignore WCHAR_MAX;
|
||||||
|
+%ignore WCHAR_MIN;
|
||||||
|
+
|
||||||
%module(threads=1) m2crypto
|
%module(threads=1) m2crypto
|
||||||
/* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.
|
/* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.
|
||||||
Disable threadallow as well, only enable it for operations likely to
|
Disable threadallow as well, only enable it for operations likely to
|
||||||
@@ -15,11 +15,6 @@
|
@@ -15,11 +20,6 @@
|
||||||
%nothreadblock;
|
%nothreadblock;
|
||||||
%nothreadallow;
|
%nothreadallow;
|
||||||
|
|
||||||
@@ -25,3 +28,8 @@ Index: M2Crypto-0.30.1/SWIG/_m2crypto.i
|
|||||||
%{
|
%{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define _WINSOCKAPI_
|
#define _WINSOCKAPI_
|
||||||
|
@@ -95,4 +95,3 @@ static PyObject *x509_store_verify_cb_fu
|
||||||
|
%constant int encrypt = 1;
|
||||||
|
%constant int decrypt = 0;
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
|||||||
Reference in New Issue
Block a user