diff options
-rw-r--r-- | meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 44 | ||||
-rw-r--r-- | meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch | 115 | ||||
-rw-r--r-- | meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb (renamed from meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb) | 15 |
3 files changed, 32 insertions, 142 deletions
diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch index 3282b5413..e517355d3 100644 --- a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | |||
@@ -29,7 +29,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
29 | set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") | 29 | set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") |
30 | set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") | 30 | set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") |
31 | set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") | 31 | set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") |
32 | @@ -769,6 +778,10 @@ if(WIN32 AND MSVC) | 32 | @@ -777,6 +786,10 @@ if(WIN32 AND MSVC) |
33 | endif() | 33 | endif() |
34 | endif() | 34 | endif() |
35 | 35 | ||
@@ -51,7 +51,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
51 | 51 | ||
52 | target_include_directories(gpr | 52 | target_include_directories(gpr |
53 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 53 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
54 | @@ -1333,6 +1350,10 @@ if(WIN32 AND MSVC) | 54 | @@ -1367,6 +1384,10 @@ if(WIN32 AND MSVC) |
55 | endif() | 55 | endif() |
56 | endif() | 56 | endif() |
57 | 57 | ||
@@ -62,7 +62,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
62 | 62 | ||
63 | target_include_directories(grpc | 63 | target_include_directories(grpc |
64 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 64 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
65 | @@ -1731,6 +1752,10 @@ if(WIN32 AND MSVC) | 65 | @@ -1782,6 +1803,10 @@ if(WIN32 AND MSVC) |
66 | endif() | 66 | endif() |
67 | endif() | 67 | endif() |
68 | 68 | ||
@@ -73,7 +73,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
73 | 73 | ||
74 | target_include_directories(grpc_cronet | 74 | target_include_directories(grpc_cronet |
75 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 75 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
76 | @@ -2744,6 +2769,10 @@ if(WIN32 AND MSVC) | 76 | @@ -2869,6 +2894,10 @@ if(WIN32 AND MSVC) |
77 | endif() | 77 | endif() |
78 | endif() | 78 | endif() |
79 | 79 | ||
@@ -84,7 +84,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
84 | 84 | ||
85 | target_include_directories(grpc_unsecure | 85 | target_include_directories(grpc_unsecure |
86 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 86 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
87 | @@ -3083,6 +3112,10 @@ if(WIN32 AND MSVC) | 87 | @@ -3206,6 +3235,10 @@ if(WIN32 AND MSVC) |
88 | endif() | 88 | endif() |
89 | endif() | 89 | endif() |
90 | 90 | ||
@@ -95,18 +95,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
95 | 95 | ||
96 | target_include_directories(grpc++ | 96 | target_include_directories(grpc++ |
97 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 97 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
98 | @@ -3703,6 +3736,10 @@ if(WIN32 AND MSVC) | 98 | @@ -3589,6 +3622,11 @@ protobuf_generate_grpc_cpp( |
99 | endif() | ||
100 | endif() | ||
101 | |||
102 | +if(_gRPC_PLATFORM_LINUX) | ||
103 | + set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) | ||
104 | + set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
105 | +endif() | ||
106 | |||
107 | target_include_directories(grpc++_cronet | ||
108 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
109 | @@ -4013,6 +4050,11 @@ protobuf_generate_grpc_cpp( | ||
110 | src/proto/grpc/status/status.proto | 99 | src/proto/grpc/status/status.proto |
111 | ) | 100 | ) |
112 | 101 | ||
@@ -118,7 +107,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
118 | target_include_directories(grpc++_error_details | 107 | target_include_directories(grpc++_error_details |
119 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 108 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
120 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | 109 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} |
121 | @@ -4147,6 +4189,11 @@ protobuf_generate_grpc_cpp( | 110 | @@ -3727,6 +3765,11 @@ protobuf_generate_grpc_cpp( |
122 | src/proto/grpc/reflection/v1alpha/reflection.proto | 111 | src/proto/grpc/reflection/v1alpha/reflection.proto |
123 | ) | 112 | ) |
124 | 113 | ||
@@ -130,7 +119,18 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
130 | target_include_directories(grpc++_reflection | 119 | target_include_directories(grpc++_reflection |
131 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 120 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
132 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | 121 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} |
133 | @@ -4704,6 +4751,10 @@ if(WIN32 AND MSVC) | 122 | @@ -3816,6 +3859,10 @@ target_link_libraries(grpc++_test_config |
123 | ${_gRPC_GFLAGS_LIBRARIES} | ||
124 | ) | ||
125 | |||
126 | +if(_gRPC_PLATFORM_LINUX) | ||
127 | + set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) | ||
128 | + set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
129 | +endif() | ||
130 | |||
131 | endif (gRPC_BUILD_TESTS) | ||
132 | if (gRPC_BUILD_TESTS) | ||
133 | @@ -4307,6 +4354,10 @@ if(WIN32 AND MSVC) | ||
134 | endif() | 134 | endif() |
135 | endif() | 135 | endif() |
136 | 136 | ||
@@ -141,7 +141,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
141 | 141 | ||
142 | target_include_directories(grpc++_unsecure | 142 | target_include_directories(grpc++_unsecure |
143 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 143 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
144 | @@ -5124,6 +5175,10 @@ if(WIN32 AND MSVC) | 144 | @@ -4745,6 +4796,10 @@ if(WIN32 AND MSVC) |
145 | endif() | 145 | endif() |
146 | endif() | 146 | endif() |
147 | 147 | ||
@@ -152,7 +152,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
152 | 152 | ||
153 | target_include_directories(grpc_plugin_support | 153 | target_include_directories(grpc_plugin_support |
154 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 154 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
155 | @@ -5190,6 +5245,11 @@ protobuf_generate_grpc_cpp( | 155 | @@ -4813,6 +4868,11 @@ protobuf_generate_grpc_cpp( |
156 | src/proto/grpc/channelz/channelz.proto | 156 | src/proto/grpc/channelz/channelz.proto |
157 | ) | 157 | ) |
158 | 158 | ||
@@ -164,7 +164,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
164 | target_include_directories(grpcpp_channelz | 164 | target_include_directories(grpcpp_channelz |
165 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 165 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
166 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | 166 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} |
167 | @@ -5728,6 +5788,10 @@ if(WIN32 AND MSVC) | 167 | @@ -5367,6 +5427,10 @@ if(WIN32 AND MSVC) |
168 | endif() | 168 | endif() |
169 | endif() | 169 | endif() |
170 | 170 | ||
diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch deleted file mode 100644 index 88b0af7f8..000000000 --- a/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch +++ /dev/null | |||
@@ -1,115 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From de6255941a5e1c2fb2d50e57f84e38c09f45023d Mon Sep 17 00:00:00 2001 | ||
4 | From: Juanli Shen <juanlishen@google.com> | ||
5 | Date: Fri, 23 Aug 2019 08:46:09 -0700 | ||
6 | Subject: [PATCH] Fix gettid() naming conflict | ||
7 | |||
8 | --- | ||
9 | src/core/lib/gpr/log_linux.cc | 6 ++++-- | ||
10 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc | ||
13 | index 561276f0c20..81026e5689b 100644 | ||
14 | --- a/src/core/lib/gpr/log_linux.cc | ||
15 | +++ b/src/core/lib/gpr/log_linux.cc | ||
16 | @@ -40,7 +40,9 @@ | ||
17 | #include <time.h> | ||
18 | #include <unistd.h> | ||
19 | |||
20 | -static long gettid(void) { return syscall(__NR_gettid); } | ||
21 | +// Not naming it as gettid() to avoid duplicate declarations when complied with | ||
22 | +// GCC 9.1. | ||
23 | +static long local_gettid(void) { return syscall(__NR_gettid); } | ||
24 | |||
25 | void gpr_log(const char* file, int line, gpr_log_severity severity, | ||
26 | const char* format, ...) { | ||
27 | @@ -70,7 +72,7 @@ void gpr_default_log(gpr_log_func_args* args) { | ||
28 | gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); | ||
29 | struct tm tm; | ||
30 | static __thread long tid = 0; | ||
31 | - if (tid == 0) tid = gettid(); | ||
32 | + if (tid == 0) tid = local_gettid(); | ||
33 | |||
34 | timer = static_cast<time_t>(now.tv_sec); | ||
35 | final_slash = strrchr(args->file, '/'); | ||
36 | From 57586a1ca7f17b1916aed3dea4ff8de872dbf853 Mon Sep 17 00:00:00 2001 | ||
37 | From: Benjamin Peterson <benjamin@dropbox.com> | ||
38 | Date: Fri, 3 May 2019 08:11:00 -0700 | ||
39 | Subject: [PATCH] Rename gettid() functions. | ||
40 | |||
41 | glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. | ||
42 | --- | ||
43 | src/core/lib/gpr/log_linux.cc | 6 ++---- | ||
44 | src/core/lib/gpr/log_posix.cc | 4 ++-- | ||
45 | src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- | ||
46 | 3 files changed, 6 insertions(+), 8 deletions(-) | ||
47 | |||
48 | diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc | ||
49 | index 81026e5689b..8b597b4cf2f 100644 | ||
50 | --- a/src/core/lib/gpr/log_linux.cc | ||
51 | +++ b/src/core/lib/gpr/log_linux.cc | ||
52 | @@ -40,9 +40,7 @@ | ||
53 | #include <time.h> | ||
54 | #include <unistd.h> | ||
55 | |||
56 | -// Not naming it as gettid() to avoid duplicate declarations when complied with | ||
57 | -// GCC 9.1. | ||
58 | -static long local_gettid(void) { return syscall(__NR_gettid); } | ||
59 | +static long sys_gettid(void) { return syscall(__NR_gettid); } | ||
60 | |||
61 | void gpr_log(const char* file, int line, gpr_log_severity severity, | ||
62 | const char* format, ...) { | ||
63 | @@ -72,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { | ||
64 | gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); | ||
65 | struct tm tm; | ||
66 | static __thread long tid = 0; | ||
67 | - if (tid == 0) tid = local_gettid(); | ||
68 | + if (tid == 0) tid = sys_gettid(); | ||
69 | |||
70 | timer = static_cast<time_t>(now.tv_sec); | ||
71 | final_slash = strrchr(args->file, '/'); | ||
72 | diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc | ||
73 | index b6edc14ab6b..2f7c6ce3760 100644 | ||
74 | --- a/src/core/lib/gpr/log_posix.cc | ||
75 | +++ b/src/core/lib/gpr/log_posix.cc | ||
76 | @@ -31,7 +31,7 @@ | ||
77 | #include <string.h> | ||
78 | #include <time.h> | ||
79 | |||
80 | -static intptr_t gettid(void) { return (intptr_t)pthread_self(); } | ||
81 | +static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } | ||
82 | |||
83 | void gpr_log(const char* file, int line, gpr_log_severity severity, | ||
84 | const char* format, ...) { | ||
85 | @@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { | ||
86 | char* prefix; | ||
87 | gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", | ||
88 | gpr_log_severity_string(args->severity), time_buffer, | ||
89 | - (int)(now.tv_nsec), gettid(), display_file, args->line); | ||
90 | + (int)(now.tv_nsec), sys_gettid(), display_file, args->line); | ||
91 | |||
92 | fprintf(stderr, "%-70s %s\n", prefix, args->message); | ||
93 | gpr_free(prefix); | ||
94 | diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc | ||
95 | index c2d80c08ddb..4a83cb6c215 100644 | ||
96 | --- a/src/core/lib/iomgr/ev_epollex_linux.cc | ||
97 | +++ b/src/core/lib/iomgr/ev_epollex_linux.cc | ||
98 | @@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, | ||
99 | } | ||
100 | |||
101 | #ifndef NDEBUG | ||
102 | -static long gettid(void) { return syscall(__NR_gettid); } | ||
103 | +static long sys_gettid(void) { return syscall(__NR_gettid); } | ||
104 | #endif | ||
105 | |||
106 | /* pollset->mu lock must be held by the caller before calling this. | ||
107 | @@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, | ||
108 | #define WORKER_PTR (&worker) | ||
109 | #endif | ||
110 | #ifndef NDEBUG | ||
111 | - WORKER_PTR->originator = gettid(); | ||
112 | + WORKER_PTR->originator = sys_gettid(); | ||
113 | #endif | ||
114 | if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { | ||
115 | gpr_log(GPR_INFO, | ||
diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb index a80c574cc..5cfa3aa82 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb | |||
@@ -11,20 +11,21 @@ DEPENDS_append_class-target = " googletest grpc-native " | |||
11 | DEPENDS_append_class-nativesdk = " grpc-native " | 11 | DEPENDS_append_class-nativesdk = " grpc-native " |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | SRCREV = "08fd59f039c7cf62614ab7741b3f34527af103c7" | 14 | SRCREV_grpc = "fe494ff4104b6f6a78117ab2da71d29c93053267" |
15 | BRANCH = "v1.22.x" | 15 | SRCREV_upb = "9effcbcb27f0a665f9f345030188c0b291e32482" |
16 | SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} \ | 16 | BRANCH = "v1.24.x" |
17 | SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ | ||
18 | git://github.com/protocolbuffers/upb;name=upb;destsuffix=git/third_party/upb \ | ||
17 | file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ | 19 | file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ |
18 | " | 20 | " |
19 | SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch \ | 21 | SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch \ |
20 | file://0001-Define-gettid-only-for-glibc-2.30.patch \ | ||
21 | " | 22 | " |
22 | SRC_URI_append_class-nativesdk = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" | 23 | SRC_URI_append_class-nativesdk = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" |
23 | 24 | ||
24 | # Fixes build with older compilers 4.8 especially on ubuntu 14.04 | 25 | # Fixes build with older compilers 4.8 especially on ubuntu 14.04 |
25 | CXXFLAGS_append_class-native = " -Wl,--no-as-needed" | 26 | CXXFLAGS_append_class-native = " -Wl,--no-as-needed" |
26 | 27 | ||
27 | inherit cmake | 28 | inherit cmake pkgconfig |
28 | 29 | ||
29 | EXTRA_OECMAKE = " \ | 30 | EXTRA_OECMAKE = " \ |
30 | -DgRPC_CARES_PROVIDER=package \ | 31 | -DgRPC_CARES_PROVIDER=package \ |
@@ -37,6 +38,10 @@ EXTRA_OECMAKE = " \ | |||
37 | -DBUILD_SHARED_LIBS=ON \ | 38 | -DBUILD_SHARED_LIBS=ON \ |
38 | " | 39 | " |
39 | 40 | ||
41 | do_configure_prepend_mipsarch() { | ||
42 | sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt | ||
43 | } | ||
44 | |||
40 | BBCLASSEXTEND = "native nativesdk" | 45 | BBCLASSEXTEND = "native nativesdk" |
41 | 46 | ||
42 | SYSROOT_DIRS_BLACKLIST_append_class-target = "${libdir}/cmake/grpc" | 47 | SYSROOT_DIRS_BLACKLIST_append_class-target = "${libdir}/cmake/grpc" |