summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2025-02-06 20:18:57 +0100
committerKhem Raj <raj.khem@gmail.com>2025-02-06 11:25:01 -0800
commit3f834832aea0745205c478daa882317feb73f0f9 (patch)
tree27c828a13299631680783d90c4e64bf6400c5299 /meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
parent132b2f82f46220619581f429cf731c15a4774f66 (diff)
downloadmeta-openembedded-3f834832aea0745205c478daa882317feb73f0f9.tar.gz
python3-grpcio: use openssl instead of bundled boringssl-with-bazel
grpc recipe already uses system openssl without problem. This also allows to remove 2 patches to maintain and corrects license, SPDX and CVE handling. Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch')
-rw-r--r--meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch73
1 files changed, 0 insertions, 73 deletions
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
deleted file mode 100644
index 790ccccc95..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1From eee5daeb5b53b0c4a013aa5887a726434ec81600 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Mon, 6 May 2024 01:36:39 +0200
4Subject: [PATCH] crypto: use _Generic only if !defined(__cplusplus)
5
6* fixes build with gcc-14 which has __builtin_addc and __builtin_subc
7 with gcc-13 it was already using the #else branch because of missing builtins
8
9* fixes
10 https://github.com/grpc/grpc/issues/35945
11
12* _Generic was introduced in boringssl with:
13 https://boringssl.googlesource.com/boringssl/+/70ca6bc24be103dabd68e448cd3af29b929b771d%5E%21/#F4
14
15* but e.g. third_party/boringssl-with-bazel/src/ssl/d1_both.cc includes
16 this internal.h and from the .cc extension gcc will process it as C++
17 where _Generic isn't available, causing:
18
19In file included from third_party/boringssl-with-bazel/src/ssl/d1_both.cc:125:
20third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h: In function 'uint32_t CRYPTO_addc_u32(uint32_t, uint32_t, uint32_t, uint32_t*)':
21third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1159:7: error: expected primary-expression before 'unsigned'
22 1159 | unsigned: __builtin_addc, \
23 | ^~~~~~~~
24third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
25 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
26 | ^~~~~~~~~~~~~~~~~~~
27third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1160:7: error: expected primary-expression before 'unsigned'
28 1160 | unsigned long: __builtin_addcl, \
29 | ^~~~~~~~
30third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
31 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
32 | ^~~~~~~~~~~~~~~~~~~
33third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1161:7: error: expected primary-expression before 'unsigned'
34 1161 | unsigned long long: __builtin_addcll))((x), (y), (carry), (out_carry))
35 | ^~~~~~~~
36third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
37 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
38 | ^~~~~~~~~~~~~~~~~~~
39third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1158:4: error: '_Generic' was not declared in this scope
40 1158 | (_Generic((x), \
41 | ^~~~~~~~
42third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
43 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
44 | ^~~~~~~~~~~~~~~~~~~
45
46Upstream-Status: Submitted [https://boringssl-review.googlesource.com/c/boringssl/+/68227 crypto: use _Generic only if !defined(__cplusplus)]
47Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
48---
49 crypto/internal.h | 4 ++--
50 1 file changed, 2 insertions(+), 2 deletions(-)
51
52diff --git a/crypto/internal.h b/crypto/internal.h
53index f93c2e5..2fca2fb 100644
54--- a/crypto/internal.h
55+++ b/crypto/internal.h
56@@ -1206,7 +1206,7 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) {
57
58 // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry
59 // bit. |carry| must be zero or one.
60-#if OPENSSL_HAS_BUILTIN(__builtin_addc)
61+#if OPENSSL_HAS_BUILTIN(__builtin_addc) && !defined(__cplusplus)
62
63 #define CRYPTO_GENERIC_ADDC(x, y, carry, out_carry) \
64 (_Generic((x), \
65@@ -1258,7 +1258,7 @@ static inline uint64_t CRYPTO_addc_u64(uint64_t x, uint64_t y, uint64_t carry,
66
67 // CRYPTO_subc_* returns |x - y - borrow|, and sets |*out_borrow| to the borrow
68 // bit. |borrow| must be zero or one.
69-#if OPENSSL_HAS_BUILTIN(__builtin_subc)
70+#if OPENSSL_HAS_BUILTIN(__builtin_subc) && !defined(__cplusplus)
71
72 #define CRYPTO_GENERIC_SUBC(x, y, borrow, out_borrow) \
73 (_Generic((x), \