diff options
author | Armin Kuster <akuster@mvista.com> | 2016-05-31 07:08:25 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-31 19:01:22 +0200 |
commit | fb574eead5eb9b7a37bbf41bc2d27010bb83b76f (patch) | |
tree | 6f7dc243c79c5fce3cb62f855e8eaf4bdc947c2e | |
parent | cb7e68f2a39fa6f24add48fc7b8d38fb7291bb44 (diff) | |
download | meta-openembedded-fb574eead5eb9b7a37bbf41bc2d27010bb83b76f.tar.gz |
python-cryptography: fix build issue do to openssl 1.0.1g upgrade
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>
-rw-r--r-- | meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch | 28 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch b/meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch new file mode 100644 index 0000000000..cbdc8ceaf2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | build issue do to openssl 1.0.1g upgrade | ||
2 | |||
3 | BIO *BIO_new_mem_buf(void *, int); | ||
4 | ^ | ||
5 | In file included from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/openssl/asn1.h:65:0, | ||
6 | from build/temp.linux-x86_64-2.7/_openssl.c:413: | ||
7 | |||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | seems to be a known issue | ||
12 | https://github.com/pyca/cryptography/issues/2750 | ||
13 | |||
14 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
15 | |||
16 | Index: cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/bio.py | ||
17 | =================================================================== | ||
18 | --- cryptography-0.8.1.orig/src/cryptography/hazmat/bindings/openssl/bio.py | ||
19 | +++ cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/bio.py | ||
20 | @@ -99,7 +99,7 @@ BIO *BIO_pop(BIO *); | ||
21 | BIO *BIO_next(BIO *); | ||
22 | BIO *BIO_find_type(BIO *, int); | ||
23 | BIO_METHOD *BIO_s_mem(void); | ||
24 | -BIO *BIO_new_mem_buf(void *, int); | ||
25 | +BIO *BIO_new_mem_buf(const void *, int); | ||
26 | BIO_METHOD *BIO_s_file(void); | ||
27 | BIO *BIO_new_file(const char *, const char *); | ||
28 | BIO *BIO_new_fp(FILE *, int); | ||
diff --git a/meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb b/meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb index 41e4acdb5b..cd1011823a 100644 --- a/meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb +++ b/meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb | |||
@@ -7,6 +7,7 @@ SRCNAME = "cryptography" | |||
7 | 7 | ||
8 | SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ | 8 | SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
10 | file://build_fix_openssl_1.0.1g.patch \ | ||
10 | " | 11 | " |
11 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 12 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
12 | 13 | ||