summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Péron <peron.clem@gmail.com>2022-04-09 00:15:18 +0200
committerKhem Raj <raj.khem@gmail.com>2022-04-10 10:05:35 -0700
commita3dab74a890d2b1e481d436e94f24e9109268019 (patch)
tree3fcc6e908ba6a528acfea330a47fc8da4e5ab0a6
parent085bfd3601aa0ac0592b4c62e3b9b9ae415b1111 (diff)
downloadmeta-openembedded-a3dab74a890d2b1e481d436e94f24e9109268019.tar.gz
grpc: remove unused patches
These patches are not used by the grpc recipe so remove them. Signed-off-by: Clément Péron <peron.clem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch107
-rw-r--r--meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch37
2 files changed, 0 insertions, 144 deletions
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch
deleted file mode 100644
index d9cfa009f9..0000000000
--- a/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch
+++ /dev/null
@@ -1,107 +0,0 @@
1From 50d54458324c1a19eefb9968e4cb556dbd34b875 Mon Sep 17 00:00:00 2001
2From: Vyacheslav Yurkov <uvv.mail@gmail.com>
3Date: Tue, 12 Oct 2021 19:11:40 +0200
4Subject: [PATCH] cmake: revert db88fb0ee826e73323e06ac6166ac038ee71f6a
5 (#27626)
6
7Fix regression introduced by previous commit. Original problem that
8commit was trying to fix was solved by modification of grpc recipe in
9meta-openembedded project repository
10
11Fixes #26857
12
13Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
14---
15 CMakeLists.txt | 16 ++++++++--------
16 templates/CMakeLists.txt.template | 2 --
17 2 files changed, 8 insertions(+), 10 deletions(-)
18
19diff --git a/CMakeLists.txt b/CMakeLists.txt
20index 0e8fbdee8b..02cd48bee4 100644
21--- a/CMakeLists.txt
22+++ b/CMakeLists.txt
23@@ -3828,7 +3828,7 @@ foreach(_hdr
24 endforeach()
25
26
27-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
28+if(gRPC_INSTALL)
29 install(TARGETS grpc_plugin_support EXPORT gRPCTargets
30 RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
31 LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
32@@ -11679,7 +11679,7 @@ target_link_libraries(grpc_cpp_plugin
33
34
35
36-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
37+if(gRPC_INSTALL)
38 install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets
39 RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
40 LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
41@@ -11718,7 +11718,7 @@ target_link_libraries(grpc_csharp_plugin
42
43
44
45-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
46+if(gRPC_INSTALL)
47 install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets
48 RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
49 LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
50@@ -11757,7 +11757,7 @@ target_link_libraries(grpc_node_plugin
51
52
53
54-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
55+if(gRPC_INSTALL)
56 install(TARGETS grpc_node_plugin EXPORT gRPCTargets
57 RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
58 LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
59@@ -11796,7 +11796,7 @@ target_link_libraries(grpc_objective_c_plugin
60
61
62
63-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
64+if(gRPC_INSTALL)
65 install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets
66 RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
67 LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
68@@ -11835,7 +11835,7 @@ target_link_libraries(grpc_php_plugin
69
70
71
72-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
73+if(gRPC_INSTALL)
74 install(TARGETS grpc_php_plugin EXPORT gRPCTargets
75 RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
76 LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
77@@ -11874,7 +11874,7 @@ target_link_libraries(grpc_python_plugin
78
79
80
81-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
82+if(gRPC_INSTALL)
83 install(TARGETS grpc_python_plugin EXPORT gRPCTargets
84 RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
85 LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
86@@ -11913,7 +11913,7 @@ target_link_libraries(grpc_ruby_plugin
87
88
89
90-if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
91+if(gRPC_INSTALL)
92 install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets
93 RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
94 LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
95diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
96index 0f0883e09c..b9a5bc4144 100644
97--- a/templates/CMakeLists.txt.template
98+++ b/templates/CMakeLists.txt.template
99@@ -695,8 +695,6 @@
100 # grpcpp_channelz doesn't build with protobuf-lite, so no install required
101 # See https://github.com/grpc/grpc/issues/22826
102 if(gRPC_INSTALL AND NOT gRPC_USE_PROTO_LITE)
103- % elif tgt.build == 'protoc':
104- if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
105 % else:
106 if(gRPC_INSTALL)
107 % endif
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch
deleted file mode 100644
index faa18bb7f7..0000000000
--- a/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 9af185be6068d279736c0d2b2162a4e768444d3d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 29 May 2021 00:41:32 -0700
4Subject: [PATCH] gsec: Fix build on musl
5
6musl defines iovec struct in alltypes.h file which is included by many
7system include files, therefore check for appropriate define from musl
8before defining it again
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 src/core/tsi/alts/crypt/gsec.h | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h
17index 4d65caa944..3c367b2895 100644
18--- a/src/core/tsi/alts/crypt/gsec.h
19+++ b/src/core/tsi/alts/crypt/gsec.h
20@@ -26,11 +26,14 @@
21 #include <stdlib.h>
22
23 #include <grpc/grpc.h>
24+#include <sys/uio.h>
25
26+#if !defined(__DEFINED_struct_iovec)
27 struct iovec {
28 void* iov_base;
29 size_t iov_len;
30 };
31+#endif
32
33 /**
34 * A gsec interface for AEAD encryption schemes. The API is thread-compatible.
35--
362.31.1
37