Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
Date: Wed, 12 Sep 2018 18:57:07
Message-Id: 1536778611.7c3ea02725492bbb3d7ce9bdea1d4b44305c69d8.gyakovlev@gentoo
1 commit: 7c3ea02725492bbb3d7ce9bdea1d4b44305c69d8
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 12 18:38:44 2018 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 12 18:56:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c3ea027
7
8 net-libs/grpc: version bump to 1.15.0
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 net-libs/grpc/Manifest | 2 +
13 .../files/grpc-1.15.0-fix-cpp-so-version.patch | 70 +++++++++
14 net-libs/grpc/grpc-1.15.0.ebuild | 173 +++++++++++++++++++++
15 3 files changed, 245 insertions(+)
16
17 diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
18 index 2f11312e5db..565aa5cecfb 100644
19 --- a/net-libs/grpc/Manifest
20 +++ b/net-libs/grpc/Manifest
21 @@ -3,4 +3,6 @@ DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b73
22 DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
23 DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356
24 DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385
25 +DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06
26 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
27 +DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
28
29 diff --git a/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch b/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
30 new file mode 100644
31 index 00000000000..ba2ca651f0c
32 --- /dev/null
33 +++ b/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
34 @@ -0,0 +1,70 @@
35 +From a443abbdbbd402951138bb8fcb2a4f159b920fcd Mon Sep 17 00:00:00 2001
36 +From: Georgy Yakovlev <gyakovlev@g.o>
37 +Date: Wed, 12 Sep 2018 11:22:48 -0700
38 +Subject: [PATCH] Fix cpp soname symlinks
39 +
40 +---
41 + Makefile | 12 ++++++------
42 + 1 file changed, 6 insertions(+), 6 deletions(-)
43 +
44 +diff --git a/Makefile b/Makefile
45 +index 4e993782ee..09bd52e8ad 100644
46 +--- a/Makefile
47 ++++ b/Makefile
48 +@@ -3050,7 +3050,7 @@ install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-con
49 + ifeq ($(SYSTEM),MINGW32)
50 + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.a
51 + else ifneq ($(SYSTEM),Darwin)
52 +- $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.6
53 ++ $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.1
54 + $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so
55 + endif
56 + $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
57 +@@ -3059,7 +3059,7 @@ endif
58 + ifeq ($(SYSTEM),MINGW32)
59 + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.a
60 + else ifneq ($(SYSTEM),Darwin)
61 +- $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.6
62 ++ $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.1
63 + $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so
64 + endif
65 + $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
66 +@@ -3068,7 +3068,7 @@ endif
67 + ifeq ($(SYSTEM),MINGW32)
68 + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.a
69 + else ifneq ($(SYSTEM),Darwin)
70 +- $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.6
71 ++ $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.1
72 + $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so
73 + endif
74 + $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
75 +@@ -3077,7 +3077,7 @@ endif
76 + ifeq ($(SYSTEM),MINGW32)
77 + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.a
78 + else ifneq ($(SYSTEM),Darwin)
79 +- $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.6
80 ++ $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.1
81 + $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so
82 + endif
83 + $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
84 +@@ -3086,7 +3086,7 @@ endif
85 + ifeq ($(SYSTEM),MINGW32)
86 + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.a
87 + else ifneq ($(SYSTEM),Darwin)
88 +- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.6
89 ++ $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
90 + $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
91 + endif
92 + $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
93 +@@ -3095,7 +3095,7 @@ endif
94 + ifeq ($(SYSTEM),MINGW32)
95 + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.a
96 + else ifneq ($(SYSTEM),Darwin)
97 +- $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.6
98 ++ $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.1
99 + $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so
100 + endif
101 + ifneq ($(SYSTEM),MINGW32)
102 +--
103 +2.18.0
104 +
105
106 diff --git a/net-libs/grpc/grpc-1.15.0.ebuild b/net-libs/grpc/grpc-1.15.0.ebuild
107 new file mode 100644
108 index 00000000000..7c59fdc3076
109 --- /dev/null
110 +++ b/net-libs/grpc/grpc-1.15.0.ebuild
111 @@ -0,0 +1,173 @@
112 +# Copyright 1999-2018 Gentoo Foundation
113 +# Distributed under the terms of the GNU General Public License v2
114 +
115 +EAPI=6
116 +
117 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
118 +DISTUTILS_OPTIONAL=1
119 +
120 +inherit distutils-r1 flag-o-matic toolchain-funcs
121 +
122 +# should match pinned git submodule version of third_party/protobuf
123 +# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
124 +# also should >=depend on same version of dev-libs/protobuf below
125 +PROTOBUF_VERSION="3.6.1"
126 +
127 +DESCRIPTION="Modern open source high performance RPC framework"
128 +HOMEPAGE="http://www.grpc.io"
129 +SRC_URI="
130 + https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
131 + tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
132 +"
133 +
134 +LICENSE="Apache-2.0"
135 +SLOT="0"
136 +KEYWORDS="~amd64 ~x86"
137 +IUSE="examples doc python systemtap static-libs tools"
138 +
139 +REQUIRED_USE="
140 + python? ( ${PYTHON_REQUIRED_USE} )
141 + tools? ( python )
142 +"
143 +
144 +RDEPEND="
145 + >=dev-libs/openssl-1.0.2:0=[-bindist]
146 + >=dev-libs/protobuf-${PROTOBUF_VERSION}:=
147 + dev-util/google-perftools
148 + net-dns/c-ares:=
149 + sys-libs/zlib:=
150 + python? ( ${PYTHON_DEPS}
151 + dev-python/cython[${PYTHON_USEDEP}]
152 + dev-python/setuptools[${PYTHON_USEDEP}]
153 + dev-python/six[${PYTHON_USEDEP}]
154 + virtual/python-enum34[${PYTHON_USEDEP}]
155 + virtual/python-futures[${PYTHON_USEDEP}]
156 + tools? ( >=dev-python/protobuf-python-${PROTOBUF_VERSION}:=[${PYTHON_USEDEP}] )
157 + )
158 + systemtap? ( dev-util/systemtap )
159 +"
160 +
161 +DEPEND="${RDEPEND}
162 + virtual/pkgconfig
163 + doc? (
164 + python? (
165 + dev-python/sphinx[${PYTHON_USEDEP}]
166 + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
167 + )
168 + )
169 +"
170 +
171 +PATCHES=(
172 + "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
173 + "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
174 + "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
175 + "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
176 + "${FILESDIR}/grpc-1.14.2-gcc8-fixes.patch"
177 + "${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
178 +)
179 +
180 +src_prepare() {
181 + sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
182 + default
183 + use python && distutils-r1_src_prepare
184 +}
185 +
186 +python_prepare() {
187 + if use tools; then
188 + rm -r third_party/protobuf || die "removing empty protobuf dir failed"
189 + ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
190 + pushd tools/distrib/python/grpcio_tools >/dev/null || die
191 + # absolute symlinks will fail
192 + # ./src -> ${S}/src
193 + ln -s ../../../../src ./ || die
194 + # ./third_party -> ${S}/third_party
195 + ln -s ../../../../third_party ./ || die
196 + # ./grpc_root -> ${S}
197 + ln -s ../../../../ ./grpc_root || die
198 + # prevent above symlinks creating huge SOURCES.TXT files, bug #661244
199 + echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
200 + popd >/dev/null || die
201 + fi
202 +}
203 +
204 +src_compile() {
205 + tc-export CC CXX PKG_CONFIG
206 +
207 + emake \
208 + V=1 \
209 + prefix=/usr \
210 + INSTALL_LIBDIR="$(get_libdir)" \
211 + AR="$(tc-getAR)" \
212 + AROPTS="rcs" \
213 + CFLAGS="${CFLAGS}" \
214 + CXXFLAGS="${CXXFLAGS}" \
215 + LD="${CC}" \
216 + LDXX="${CXX}" \
217 + STRIP=/bin/true \
218 + HOST_CC="$(tc-getBUILD_CC)" \
219 + HOST_CXX="$(tc-getBUILD_CXX)" \
220 + HOST_LD="$(tc-getBUILD_CC)" \
221 + HOST_LDXX="$(tc-getBUILD_CXX)" \
222 + HOST_AR="$(tc-getBUILD_AR)" \
223 + HAS_SYSTEMTAP="$(usex systemtap true false)"
224 +
225 + use python && distutils-r1_src_compile
226 +}
227 +
228 +python_compile() {
229 + export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
230 + export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
231 + export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
232 + export GRPC_PYTHON_BUILD_WITH_CYTHON=1
233 + distutils-r1_python_compile
234 +
235 + if use tools; then
236 + pushd tools/distrib/python/grpcio_tools >/dev/null || die
237 + distutils-r1_python_compile
238 + popd >/dev/null || die
239 + fi
240 +}
241 +
242 +python_compile_all() {
243 + if use doc; then
244 + esetup.py doc
245 + mv doc/build doc/html || die
246 + fi
247 +}
248 +
249 +src_install() {
250 + emake \
251 + prefix="${D}"/usr \
252 + INSTALL_LIBDIR="$(get_libdir)" \
253 + STRIP=/bin/true \
254 + install
255 +
256 + use static-libs || find "${ED}" -name '*.a' -delete
257 +
258 + if use examples; then
259 + find examples -name '.gitignore' -delete || die
260 + dodoc -r examples
261 + docompress -x /usr/share/doc/${PF}/examples
262 + fi
263 +
264 + # only define DOCS array if requested, otherwise portage default is fine
265 + if use doc; then
266 + find doc -name '.gitignore' -delete || die
267 + local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
268 + fi
269 +
270 + einstalldocs
271 +
272 + use python && distutils-r1_src_install
273 +
274 +}
275 +
276 +python_install() {
277 + distutils-r1_python_install
278 +
279 + if use tools; then
280 + pushd tools/distrib/python/grpcio_tools >/dev/null || die
281 + distutils-r1_python_install
282 + popd >/dev/null || die
283 + fi
284 +}