1 |
commit: 20ebf5fa76c976d8ba2670277ee4c24e6cd3575c |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 30 08:04:53 2018 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 30 08:06:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ebf5fa |
7 |
|
8 |
net-libs/grpc: version bump to 1.13.0 |
9 |
|
10 |
Fix protobuf plugins not respecting CFLAGS |
11 |
|
12 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
13 |
|
14 |
net-libs/grpc/Manifest | 1 + |
15 |
.../0001-grpc-1.13.0-fix-host-ar-handling.patch | 47 ++++++ |
16 |
net-libs/grpc/grpc-1.13.0.ebuild | 171 +++++++++++++++++++++ |
17 |
3 files changed, 219 insertions(+) |
18 |
|
19 |
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest |
20 |
index cd8bbcbf7ef..93ed53e4b94 100644 |
21 |
--- a/net-libs/grpc/Manifest |
22 |
+++ b/net-libs/grpc/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49 |
25 |
DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962 |
26 |
+DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254 |
27 |
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 |
28 |
|
29 |
diff --git a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..926952f47f2 |
32 |
--- /dev/null |
33 |
+++ b/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch |
34 |
@@ -0,0 +1,47 @@ |
35 |
+From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001 |
36 |
+From: Georgy Yakovlev <gyakovlev@g.o> |
37 |
+Date: Sat, 30 Jun 2018 00:21:53 -0700 |
38 |
+Subject: [PATCH] Makefile: fix host ar handling |
39 |
+ |
40 |
+Cherry picked lines from |
41 |
+https://github.com/grpc/grpc/pull/11476 |
42 |
+--- |
43 |
+ Makefile | 6 ++++-- |
44 |
+ 1 file changed, 4 insertions(+), 2 deletions(-) |
45 |
+ |
46 |
+diff --git a/Makefile b/Makefile |
47 |
+index 8333858588..b5a44b7096 100644 |
48 |
+--- a/Makefile |
49 |
++++ b/Makefile |
50 |
+@@ -328,6 +328,7 @@ HOST_CC ?= $(CC) |
51 |
+ HOST_CXX ?= $(CXX) |
52 |
+ HOST_LD ?= $(LD) |
53 |
+ HOST_LDXX ?= $(LDXX) |
54 |
++HOST_AR ?= $(AR) |
55 |
+ |
56 |
+ CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI) |
57 |
+ CXXFLAGS += -std=c++11 |
58 |
+@@ -444,6 +445,7 @@ HOST_CFLAGS = $(CFLAGS) |
59 |
+ HOST_CXXFLAGS = $(CXXFLAGS) |
60 |
+ HOST_LDFLAGS = $(LDFLAGS) |
61 |
+ HOST_LDLIBS = $(LDLIBS) |
62 |
++HOST_AROPTS = $(AROPTS) |
63 |
+ |
64 |
+ # These are automatically computed variables. |
65 |
+ # There shouldn't be any need to change anything from now on. |
66 |
+@@ -6886,10 +6888,10 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error |
67 |
+ else |
68 |
+ |
69 |
+ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) |
70 |
+- $(E) "[AR] Creating $@" |
71 |
++ $(E) "[HOSTAR] Creating $@" |
72 |
+ $(Q) mkdir -p `dirname $@` |
73 |
+ $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a |
74 |
+- $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) |
75 |
++ $(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) |
76 |
+ ifeq ($(SYSTEM),Darwin) |
77 |
+ $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a |
78 |
+ endif |
79 |
+-- |
80 |
+2.18.0 |
81 |
+ |
82 |
|
83 |
diff --git a/net-libs/grpc/grpc-1.13.0.ebuild b/net-libs/grpc/grpc-1.13.0.ebuild |
84 |
new file mode 100644 |
85 |
index 00000000000..ff81aa55ff0 |
86 |
--- /dev/null |
87 |
+++ b/net-libs/grpc/grpc-1.13.0.ebuild |
88 |
@@ -0,0 +1,171 @@ |
89 |
+# Copyright 1999-2018 Gentoo Foundation |
90 |
+# Distributed under the terms of the GNU General Public License v2 |
91 |
+ |
92 |
+EAPI=6 |
93 |
+ |
94 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
95 |
+DISTUTILS_OPTIONAL=1 |
96 |
+ |
97 |
+inherit distutils-r1 flag-o-matic toolchain-funcs |
98 |
+ |
99 |
+# should match pinned git submodule version of third_party/protobuf |
100 |
+# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party |
101 |
+# also should ~depend on same version of dev-libs/protobuf below |
102 |
+PROTOBUF_VERSION="3.5.2" |
103 |
+ |
104 |
+DESCRIPTION="Modern open source high performance RPC framework" |
105 |
+HOMEPAGE="http://www.grpc.io" |
106 |
+SRC_URI=" |
107 |
+ https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
108 |
+ tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz ) |
109 |
+" |
110 |
+ |
111 |
+LICENSE="Apache-2.0" |
112 |
+SLOT="0" |
113 |
+KEYWORDS="~amd64 ~x86" |
114 |
+IUSE="examples doc python systemtap static-libs tools" |
115 |
+ |
116 |
+REQUIRED_USE=" |
117 |
+ python? ( ${PYTHON_REQUIRED_USE} ) |
118 |
+ tools? ( python ) |
119 |
+" |
120 |
+ |
121 |
+RDEPEND=" |
122 |
+ >=dev-libs/openssl-1.0.2:0=[-bindist] |
123 |
+ ~dev-libs/protobuf-${PROTOBUF_VERSION}:= |
124 |
+ dev-util/google-perftools |
125 |
+ net-dns/c-ares:= |
126 |
+ sys-libs/zlib:= |
127 |
+ python? ( ${PYTHON_DEPS} |
128 |
+ dev-python/coverage[${PYTHON_USEDEP}] |
129 |
+ dev-python/cython[${PYTHON_USEDEP}] |
130 |
+ >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}] |
131 |
+ dev-python/six[${PYTHON_USEDEP}] |
132 |
+ dev-python/wheel[${PYTHON_USEDEP}] |
133 |
+ virtual/python-enum34[${PYTHON_USEDEP}] |
134 |
+ virtual/python-futures[${PYTHON_USEDEP}] |
135 |
+ ) |
136 |
+ systemtap? ( dev-util/systemtap ) |
137 |
+" |
138 |
+ |
139 |
+DEPEND="${RDEPEND} |
140 |
+ virtual/pkgconfig |
141 |
+ doc? ( |
142 |
+ python? ( |
143 |
+ dev-python/sphinx[${PYTHON_USEDEP}] |
144 |
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
145 |
+ ) |
146 |
+ ) |
147 |
+" |
148 |
+ |
149 |
+PATCHES=( |
150 |
+ "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" |
151 |
+ "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch" |
152 |
+ "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" |
153 |
+ "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch" |
154 |
+ "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" |
155 |
+ "${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch" |
156 |
+) |
157 |
+ |
158 |
+src_prepare() { |
159 |
+ sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" |
160 |
+ default |
161 |
+ use python && distutils-r1_src_prepare |
162 |
+} |
163 |
+ |
164 |
+python_prepare() { |
165 |
+ if use tools; then |
166 |
+ rm -r third_party/protobuf || die "removing empty protobuf dir failed" |
167 |
+ ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die |
168 |
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die |
169 |
+ # absolute symlinks will fail |
170 |
+ # ./src -> ${S}/src |
171 |
+ ln -s ../../../../src ./ || die |
172 |
+ # ./third_party -> ${S}/third_party |
173 |
+ ln -s ../../../../third_party ./ || die |
174 |
+ # ./grpc_root -> ${S} |
175 |
+ ln -s ../../../../ ./grpc_root || die |
176 |
+ popd >/dev/null || die |
177 |
+ fi |
178 |
+} |
179 |
+ |
180 |
+src_compile() { |
181 |
+ tc-export CC CXX PKG_CONFIG |
182 |
+ |
183 |
+ emake \ |
184 |
+ V=1 \ |
185 |
+ prefix=/usr \ |
186 |
+ INSTALL_LIBDIR="$(get_libdir)" \ |
187 |
+ AR="$(tc-getAR)" \ |
188 |
+ AROPTS="rcs" \ |
189 |
+ CFLAGS="${CFLAGS}" \ |
190 |
+ CXXFLAGS="${CXXFLAGS}" \ |
191 |
+ LD="${CC}" \ |
192 |
+ LDXX="${CXX}" \ |
193 |
+ STRIP=/bin/true \ |
194 |
+ HOST_CC="$(tc-getBUILD_CC)" \ |
195 |
+ HOST_CXX="$(tc-getBUILD_CXX)" \ |
196 |
+ HOST_LD="$(tc-getBUILD_CC)" \ |
197 |
+ HOST_LDXX="$(tc-getBUILD_CXX)" \ |
198 |
+ HOST_AR="$(tc-getBUILD_AR)" \ |
199 |
+ HAS_SYSTEMTAP="$(usex systemtap true false)" |
200 |
+ |
201 |
+ use python && distutils-r1_src_compile |
202 |
+} |
203 |
+ |
204 |
+python_compile() { |
205 |
+ export GRPC_PYTHON_BUILD_SYSTEM_CARES=1 |
206 |
+ export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 |
207 |
+ export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 |
208 |
+ export GRPC_PYTHON_BUILD_WITH_CYTHON=1 |
209 |
+ distutils-r1_python_compile |
210 |
+ |
211 |
+ if use tools; then |
212 |
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die |
213 |
+ distutils-r1_python_compile |
214 |
+ popd >/dev/null || die |
215 |
+ fi |
216 |
+} |
217 |
+ |
218 |
+python_compile_all() { |
219 |
+ if use doc; then |
220 |
+ esetup.py doc |
221 |
+ mv doc/build doc/html || die |
222 |
+ fi |
223 |
+} |
224 |
+ |
225 |
+src_install() { |
226 |
+ emake \ |
227 |
+ prefix="${D}"/usr \ |
228 |
+ INSTALL_LIBDIR="$(get_libdir)" \ |
229 |
+ STRIP=/bin/true \ |
230 |
+ install |
231 |
+ |
232 |
+ use static-libs || find "${ED}" -name '*.a' -delete |
233 |
+ |
234 |
+ if use examples; then |
235 |
+ find examples -name '.gitignore' -delete || die |
236 |
+ dodoc -r examples |
237 |
+ docompress -x /usr/share/doc/${PF}/examples |
238 |
+ fi |
239 |
+ |
240 |
+ if use doc; then |
241 |
+ find doc -name '.gitignore' -delete || die |
242 |
+ local DOCS=( AUTHORS README.md doc/. ) |
243 |
+ fi |
244 |
+ |
245 |
+ einstalldocs |
246 |
+ |
247 |
+ use python && distutils-r1_src_install |
248 |
+ |
249 |
+} |
250 |
+ |
251 |
+python_install() { |
252 |
+ distutils-r1_python_install |
253 |
+ |
254 |
+ if use tools; then |
255 |
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die |
256 |
+ distutils-r1_python_install |
257 |
+ popd >/dev/null || die |
258 |
+ fi |
259 |
+} |