1 |
commit: bf6b4895ed89ae2061d7f42487b269d25bbb956b |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 17 02:15:26 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 17 02:59:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6b4895 |
7 |
|
8 |
net-libs/grpc: bump to 1.23.0 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/692012 |
11 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
13 |
|
14 |
net-libs/grpc/Manifest | 1 + |
15 |
.../grpc/files/grpc-1.22.1-glibc-2.30-compat.patch | 78 ++++++++++++++ |
16 |
net-libs/grpc/grpc-1.23.0.ebuild | 113 +++++++++++++++++++++ |
17 |
3 files changed, 192 insertions(+) |
18 |
|
19 |
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest |
20 |
index f80ec4ac5af..e210b147a9e 100644 |
21 |
--- a/net-libs/grpc/Manifest |
22 |
+++ b/net-libs/grpc/Manifest |
23 |
@@ -5,3 +5,4 @@ DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f7 |
24 |
DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583 |
25 |
DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114 |
26 |
DIST grpc-1.22.0.tar.gz 15082718 BLAKE2B 679be0488fc02441d5ba555c9150532e6ceb00bbaee9fe8b22881bef8ab713f45f96283f123576738285cfe8d358eb458cac9252bac7766cfd8ee5ac6e97fda9 SHA512 e8181f01bc44dc7e7a9e8c74c0a9c3f25960bb9c88c239e7c75764105ca24ac173bab663130fb6349c7fa43cd57f35dd7927a369482b1e6a73224cb2174bd336 |
27 |
+DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0 |
28 |
|
29 |
diff --git a/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch b/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..90bd9115893 |
32 |
--- /dev/null |
33 |
+++ b/net-libs/grpc/files/grpc-1.22.1-glibc-2.30-compat.patch |
34 |
@@ -0,0 +1,78 @@ |
35 |
+From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001 |
36 |
+From: Benjamin Peterson <benjamin@×××××××.com> |
37 |
+Date: Fri, 3 May 2019 08:11:00 -0700 |
38 |
+Subject: [PATCH] Rename gettid() functions. |
39 |
+ |
40 |
+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. |
41 |
+--- |
42 |
+ src/core/lib/gpr/log_linux.cc | 4 ++-- |
43 |
+ src/core/lib/gpr/log_posix.cc | 4 ++-- |
44 |
+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- |
45 |
+ 3 files changed, 6 insertions(+), 6 deletions(-) |
46 |
+ |
47 |
+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc |
48 |
+index 561276f0c20..8b597b4cf2f 100644 |
49 |
+--- a/src/core/lib/gpr/log_linux.cc |
50 |
++++ b/src/core/lib/gpr/log_linux.cc |
51 |
+@@ -40,7 +40,7 @@ |
52 |
+ #include <time.h> |
53 |
+ #include <unistd.h> |
54 |
+ |
55 |
+-static long gettid(void) { return syscall(__NR_gettid); } |
56 |
++static long sys_gettid(void) { return syscall(__NR_gettid); } |
57 |
+ |
58 |
+ void gpr_log(const char* file, int line, gpr_log_severity severity, |
59 |
+ const char* format, ...) { |
60 |
+@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { |
61 |
+ gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); |
62 |
+ struct tm tm; |
63 |
+ static __thread long tid = 0; |
64 |
+- if (tid == 0) tid = gettid(); |
65 |
++ if (tid == 0) tid = sys_gettid(); |
66 |
+ |
67 |
+ timer = static_cast<time_t>(now.tv_sec); |
68 |
+ final_slash = strrchr(args->file, '/'); |
69 |
+diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc |
70 |
+index b6edc14ab6b..2f7c6ce3760 100644 |
71 |
+--- a/src/core/lib/gpr/log_posix.cc |
72 |
++++ b/src/core/lib/gpr/log_posix.cc |
73 |
+@@ -31,7 +31,7 @@ |
74 |
+ #include <string.h> |
75 |
+ #include <time.h> |
76 |
+ |
77 |
+-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } |
78 |
++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } |
79 |
+ |
80 |
+ void gpr_log(const char* file, int line, gpr_log_severity severity, |
81 |
+ const char* format, ...) { |
82 |
+@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { |
83 |
+ char* prefix; |
84 |
+ gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", |
85 |
+ gpr_log_severity_string(args->severity), time_buffer, |
86 |
+- (int)(now.tv_nsec), gettid(), display_file, args->line); |
87 |
++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); |
88 |
+ |
89 |
+ fprintf(stderr, "%-70s %s\n", prefix, args->message); |
90 |
+ gpr_free(prefix); |
91 |
+diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc |
92 |
+index 08116b3ab53..76f59844312 100644 |
93 |
+--- a/src/core/lib/iomgr/ev_epollex_linux.cc |
94 |
++++ b/src/core/lib/iomgr/ev_epollex_linux.cc |
95 |
+@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, |
96 |
+ } |
97 |
+ |
98 |
+ #ifndef NDEBUG |
99 |
+-static long gettid(void) { return syscall(__NR_gettid); } |
100 |
++static long sys_gettid(void) { return syscall(__NR_gettid); } |
101 |
+ #endif |
102 |
+ |
103 |
+ /* pollset->mu lock must be held by the caller before calling this. |
104 |
+@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, |
105 |
+ #define WORKER_PTR (&worker) |
106 |
+ #endif |
107 |
+ #ifndef NDEBUG |
108 |
+- WORKER_PTR->originator = gettid(); |
109 |
++ WORKER_PTR->originator = sys_gettid(); |
110 |
+ #endif |
111 |
+ if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { |
112 |
+ gpr_log(GPR_INFO, |
113 |
|
114 |
diff --git a/net-libs/grpc/grpc-1.23.0.ebuild b/net-libs/grpc/grpc-1.23.0.ebuild |
115 |
new file mode 100644 |
116 |
index 00000000000..74504ed8562 |
117 |
--- /dev/null |
118 |
+++ b/net-libs/grpc/grpc-1.23.0.ebuild |
119 |
@@ -0,0 +1,113 @@ |
120 |
+# Copyright 1999-2019 Gentoo Authors |
121 |
+# Distributed under the terms of the GNU General Public License v2 |
122 |
+ |
123 |
+EAPI=7 |
124 |
+ |
125 |
+inherit flag-o-matic toolchain-funcs |
126 |
+ |
127 |
+MY_PV="${PV//_pre/-pre}" |
128 |
+ |
129 |
+DESCRIPTION="Modern open source high performance RPC framework" |
130 |
+HOMEPAGE="https://www.grpc.io" |
131 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
132 |
+ |
133 |
+LICENSE="Apache-2.0" |
134 |
+SLOT="0" |
135 |
+KEYWORDS="~amd64 ~x86" |
136 |
+IUSE="examples doc perftools systemtap static-libs" |
137 |
+ |
138 |
+DEPEND=" |
139 |
+ >=dev-libs/openssl-1.0.2:0=[-bindist] |
140 |
+ >=dev-libs/protobuf-3.7.0:= |
141 |
+ >=net-dns/c-ares-1.15.0:= |
142 |
+ sys-libs/zlib:= |
143 |
+ perftools? ( dev-util/google-perftools:= ) |
144 |
+ systemtap? ( dev-util/systemtap ) |
145 |
+" |
146 |
+ |
147 |
+RDEPEND="${DEPEND}" |
148 |
+BDEPEND="virtual/pkgconfig" |
149 |
+ |
150 |
+# requires network |
151 |
+RESTRICT="test" |
152 |
+ |
153 |
+PATCHES=( |
154 |
+ "${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch" |
155 |
+ "${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch" |
156 |
+ "${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch" |
157 |
+ "${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844 |
158 |
+ "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" # https://github.com/grpc/grpc/pull/18950 |
159 |
+) |
160 |
+ |
161 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
162 |
+ |
163 |
+src_prepare() { |
164 |
+ rm -r third_party/cares || die |
165 |
+ sed -i 's:-Werror::g' Makefile || die |
166 |
+ sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" |
167 |
+ |
168 |
+ default |
169 |
+} |
170 |
+ |
171 |
+src_compile() { |
172 |
+ tc-export CC CXX PKG_CONFIG |
173 |
+ |
174 |
+ local myemakeargs=( |
175 |
+ V=1 |
176 |
+ prefix=/usr |
177 |
+ INSTALL_LIBDIR="$(get_libdir)" |
178 |
+ AR="$(tc-getAR)" |
179 |
+ AROPTS="rcs" |
180 |
+ CFLAGS="${CFLAGS}" |
181 |
+ CXXFLAGS="${CXXFLAGS}" |
182 |
+ LD="${CC}" |
183 |
+ LDXX="${CXX}" |
184 |
+ STRIP=/bin/true |
185 |
+ HOST_AR="$(tc-getBUILD_AR)" |
186 |
+ HOST_CC="$(tc-getBUILD_CC)" |
187 |
+ HOST_CXX="$(tc-getBUILD_CXX)" |
188 |
+ HOST_LD="$(tc-getBUILD_CC)" |
189 |
+ HOST_LDXX="$(tc-getBUILD_CXX)" |
190 |
+ HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)" |
191 |
+ HAS_SYSTEMTAP="$(usex systemtap true false)" |
192 |
+ ) |
193 |
+ |
194 |
+ emake "${myemakeargs[@]}" |
195 |
+} |
196 |
+ |
197 |
+src_install() { |
198 |
+ local myemakeargs=( |
199 |
+ V=1 |
200 |
+ prefix="${ED}"/usr |
201 |
+ INSTALL_LIBDIR="$(get_libdir)" |
202 |
+ STRIP=/bin/true |
203 |
+ ) |
204 |
+ |
205 |
+ emake "${myemakeargs[@]}" install |
206 |
+ |
207 |
+ use static-libs || find "${ED}" -name '*.a' -delete |
208 |
+ |
209 |
+ if use examples; then |
210 |
+ find examples -name '.gitignore' -delete || die |
211 |
+ dodoc -r examples |
212 |
+ docompress -x /usr/share/doc/${PF}/examples |
213 |
+ fi |
214 |
+ |
215 |
+ if use doc; then |
216 |
+ find doc -name '.gitignore' -delete || die |
217 |
+ local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. ) |
218 |
+ fi |
219 |
+ |
220 |
+ einstalldocs |
221 |
+} |
222 |
+ |
223 |
+pkg_postinst() { |
224 |
+ local v |
225 |
+ for v in ${REPLACING_VERSIONS}; do |
226 |
+ if ver_test "${v}" -lt 1.16.0; then |
227 |
+ ewarn "python bindings and tools moved to separate independent packages" |
228 |
+ ewarn "check dev-python/grpcio and dev-python/grpcio-tools" |
229 |
+ fi |
230 |
+ done |
231 |
+ |
232 |
+} |