CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

python-cryptography: fix build issue do to openssl 1.0.1g upgrade

Browse Source 
this fixes

build/temp.linux-x86_64-2.7/_openssl.c:697:6: error: conflicting types for 'BIO_new_mem_buf'
BIO *BIO_new_mem_buf(void *, int);
       ^
In file included from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/openssl/asn1.h:65:0,
from build/temp.linux-x86_64-2.7/_openssl.c:413:

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Armin Kuster 2016-05-31 07:08:25 -07:00 committed by Martin Jansa
parent cb7e68f2a3
commit fb574eead5
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch Normal file
View File

@ -0,0 +1,28 @@
build issue do to openssl 1.0.1g upgrade
BIO *BIO_new_mem_buf(void *, int);
^
In file included from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/openssl/asn1.h:65:0,
from build/temp.linux-x86_64-2.7/_openssl.c:413:
Upstream-Status: Pending
seems to be a known issue
https://github.com/pyca/cryptography/issues/2750
Signed-off-by: Armin Kuster <akuster@mvista.com>
Index: cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/bio.py
===================================================================
--- cryptography-0.8.1.orig/src/cryptography/hazmat/bindings/openssl/bio.py
+++ cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/bio.py
@@ -99,7 +99,7 @@ BIO *BIO_pop(BIO *);
BIO *BIO_next(BIO *);
BIO *BIO_find_type(BIO *, int);
BIO_METHOD *BIO_s_mem(void);
-BIO *BIO_new_mem_buf(void *, int);
+BIO *BIO_new_mem_buf(const void *, int);
BIO_METHOD *BIO_s_file(void);
BIO *BIO_new_file(const char *, const char *);
BIO *BIO_new_fp(FILE *, int);

1
meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb
View File

@ -7,6 +7,7 @@ SRCNAME = "cryptography"
SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
file://run-ptest \
file://build_fix_openssl_1.0.1g.patch \
"
S = "${WORKDIR}/${SRCNAME}-${PV}"