[gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2018-06-12  6:53 Jason Zaman
  0 siblings, 0 replies; 15+ messages in thread
From: Jason Zaman @ 2018-06-12  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3a42fbdae17de388d96fed660e15686b19473362
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 06:52:14 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 06:52:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a42fbda

net-libs/grpc: fix building with gcc8

Closes: https://bugs.gentoo.org/656166
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch   | 53 ++++++++++++++++++++++
 net-libs/grpc/grpc-1.12.1.ebuild                   |  1 +
 2 files changed, 54 insertions(+)

diff --git a/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch b/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
new file mode 100644
index 00000000000..a9168f165e1
--- /dev/null
+++ b/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
@@ -0,0 +1,53 @@
+--- a/tmp/alts_transport_security.cc.ORIG	2018-04-13 20:08:11.000000000 +0200
++++ b/src/core/tsi/alts_transport_security.cc	2018-05-20 16:54:49.995787548 +0200
+@@ -45,7 +45,7 @@
+ }
+ 
+ void grpc_tsi_alts_init() {
+-  memset(&g_alts_resource, 0, sizeof(alts_shared_resource));
++  memset((void*)&g_alts_resource, 0, sizeof(alts_shared_resource));
+   gpr_mu_init(&g_alts_resource.mu);
+   gpr_cv_init(&g_alts_resource.cv);
+ }
+--- a/tmp/client_channel.cc.ORIG	2018-04-13 20:08:11.000000000 +0200
++++ b/src/core/ext/filters/client_channel/client_channel.cc	2018-05-20 17:07:20.604746186 +0200
+@@ -416,7 +416,7 @@
+             grpc_uri* uri = grpc_uri_parse(server_uri, true);
+             GPR_ASSERT(uri->path[0] != '\0');
+             service_config_parsing_state parsing_state;
+-            memset(&parsing_state, 0, sizeof(parsing_state));
++            memset((void*)&parsing_state, 0, sizeof(parsing_state));
+             parsing_state.server_name =
+                 uri->path[0] == '/' ? uri->path + 1 : uri->path;
+             service_config->ParseGlobalParams(parse_retry_throttle_params,
+--- a/tmp/channel.cc.ORIG	2018-04-13 20:08:11.000000000 +0200
++++ b/src/core/lib/surface/channel.cc	2018-05-20 16:58:01.632776988 +0200
+@@ -103,7 +103,7 @@
+     return channel;
+   }
+ 
+-  memset(channel, 0, sizeof(*channel));
++  memset((void*)channel, 0, sizeof(*channel));
+   channel->target = target;
+   channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type);
+   size_t channel_tracer_max_nodes = 0;  // default to off
+@@ -280,7 +280,7 @@
+   }
+ 
+   grpc_call_create_args args;
+-  memset(&args, 0, sizeof(args));
++  memset((void*)&args, 0, sizeof(args));
+   args.channel = channel;
+   args.parent = parent_call;
+   args.propagation_mask = propagation_mask;
+--- a/tmp/flow_control.cc.ORIG	2018-04-13 20:08:11.000000000 +0200
++++ b/src/core/ext/transport/chttp2/transport/flow_control.cc	2018-05-20 17:09:47.055738116 +0200
+@@ -187,7 +187,7 @@
+ uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) {
+   FlowControlTrace trace("t updt sent", this, nullptr);
+   const uint32_t target_announced_window =
+-      static_cast<const uint32_t>(target_window());
++      static_cast<uint32_t>(target_window());
+   if ((writing_anyway || announced_window_ <= target_announced_window / 2) &&
+       announced_window_ != target_announced_window) {
+     const uint32_t announce = static_cast<uint32_t> GPR_CLAMP(

diff --git a/net-libs/grpc/grpc-1.12.1.ebuild b/net-libs/grpc/grpc-1.12.1.ebuild
index 774c0518b1d..e57c672f483 100644
--- a/net-libs/grpc/grpc-1.12.1.ebuild
+++ b/net-libs/grpc/grpc-1.12.1.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}/0006-grpc-1.12.1-allow-system-openssl.patch"
 	"${FILESDIR}/0007-grpc-1.12.1-allow-system-zlib.patch"
 	"${FILESDIR}/0008-grpc-1.12.1-allow-system-cares.patch"
+	"${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2018-06-12  6:53 Jason Zaman
  0 siblings, 0 replies; 15+ messages in thread
From: Jason Zaman @ 2018-06-12  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5a5cce25d69125ae024db31aa2b8f37689876164
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Mon Jun 11 08:33:19 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 06:33:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5cce25

net-libs/grpc: bump to 1.12.1, add python and more

Add python useflag and module installation.
Add tools useflag and grpc_tools installation.
Add google-perftools dep.
Add systemtap useflag to fix automagic dep.
Add doc useflag
Add examples useflag
Add myself to metadata, as discussed with perfinion

Closes: https://bugs.gentoo.org/590360

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/grpc/Manifest                             |   2 +
 .../0006-grpc-1.12.1-allow-system-openssl.patch    |  65 +++++++++
 .../files/0007-grpc-1.12.1-allow-system-zlib.patch |  52 +++++++
 .../0008-grpc-1.12.1-allow-system-cares.patch      |  52 +++++++
 net-libs/grpc/grpc-1.12.1.ebuild                   | 159 +++++++++++++++++++++
 net-libs/grpc/metadata.xml                         |  11 ++
 6 files changed, 341 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 99b7d82abd1..cd8bbcbf7ef 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1 +1,3 @@
 DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
+DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
+DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181

diff --git a/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch b/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
new file mode 100644
index 00000000000..61fd830d64d
--- /dev/null
+++ b/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
@@ -0,0 +1,65 @@
+From 30ce693621d61efb8596503a0da212077a8c4daa Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold <tbechtold@suse.com>
+Date: Thu, 24 May 2018 17:12:13 +0200
+Subject: [PATCH] Allow building the python module with system openssl
+
+When building the python module and using the new
+GRPC_PYTHON_BUILD_SYSTEM_OPENSSL env variable, the third party
+boringssl code is not compiled. Instead, the openssl shared library
+installed on the system is used during runtime.
+This is useful for distributions who don't want to include code copies
+but use shared libraries instead.
+---
+ setup.py | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 99d1a1c504e..3a5ed56c641 100644
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@
+ PY3 = sys.version_info.major == 3
+ PYTHON_STEM = os.path.join('src', 'python', 'grpcio')
+ CORE_INCLUDE = ('include', '.',)
+-BORINGSSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
++SSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
+ ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),)
+ CARES_INCLUDE = (
+     os.path.join('third_party', 'cares'),
+@@ -84,6 +84,12 @@
+ # present, then it will still attempt to use Cython.
+ BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
+ 
++# Export this variable to use the system installation of openssl. You need to
++# have the header files installed (in /usr/include/openssl) and during
++# runtime, the shared libary must be installed
++BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
++                                           False)
++
+ # Environment variable to determine whether or not to enable coverage analysis
+ # in Cython modules.
+ ENABLE_CYTHON_TRACING = os.environ.get(
+@@ -148,8 +154,13 @@
+ if "win32" in sys.platform:
+   CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
+ 
++if BUILD_WITH_SYSTEM_OPENSSL:
++  CORE_C_FILES = filter(lambda x: 'third_party/boringssl' not in x, CORE_C_FILES)
++  CORE_C_FILES = filter(lambda x: 'src/boringssl' not in x, CORE_C_FILES)
++  SSL_INCLUDE = (os.path.join('/usr', 'include', 'openssl'),)
++
+ EXTENSION_INCLUDE_DIRECTORIES = (
+-    (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE +
++    (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
+     CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
+ 
+ EXTENSION_LIBRARIES = ()
+@@ -159,6 +170,8 @@
+   EXTENSION_LIBRARIES += ('m',)
+ if "win32" in sys.platform:
+   EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
++if BUILD_WITH_SYSTEM_OPENSSL:
++  EXTENSION_LIBRARIES += ('ssl', 'crypto',)
+ 
+ DEFINE_MACROS = (
+     ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),

diff --git a/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch b/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch
new file mode 100644
index 00000000000..6964642b119
--- /dev/null
+++ b/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch
@@ -0,0 +1,52 @@
+From 3823d9048102bce79e165584c62a1a5b91810aeb Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold <tbechtold@suse.com>
+Date: Fri, 25 May 2018 06:52:23 +0200
+Subject: [PATCH] Allow building the python module with system zlib
+
+When building the python module and using the new
+GRPC_PYTHON_BUILD_SYSTEM_ZLIB env variable, the third party zlib code
+is not compiled. Instead, the zlib shared library installed on the
+system is used during runtime.
+This is useful for distributions who don't want to include code copies
+but use shared libraries instead.
+---
+ setup.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 3a5ed56c641..483d3ac1682 100644
+--- a/setup.py
++++ b/setup.py
+@@ -90,6 +90,12 @@
+ BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
+                                            False)
+ 
++# Export this variable to use the system installation of zlib. You need to
++# have the header files installed (in /usr/include/) and during
++# runtime, the shared libary must be installed
++BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
++                                        False)
++
+ # Environment variable to determine whether or not to enable coverage analysis
+ # in Cython modules.
+ ENABLE_CYTHON_TRACING = os.environ.get(
+@@ -159,6 +165,10 @@
+   CORE_C_FILES = filter(lambda x: 'src/boringssl' not in x, CORE_C_FILES)
+   SSL_INCLUDE = (os.path.join('/usr', 'include', 'openssl'),)
+ 
++if BUILD_WITH_SYSTEM_ZLIB:
++  CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES)
++  ZLIB_INCLUDE = (os.path.join('/usr', 'include'),)
++
+ EXTENSION_INCLUDE_DIRECTORIES = (
+     (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
+     CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
+@@ -172,6 +182,8 @@
+   EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
+ if BUILD_WITH_SYSTEM_OPENSSL:
+   EXTENSION_LIBRARIES += ('ssl', 'crypto',)
++if BUILD_WITH_SYSTEM_ZLIB:
++  EXTENSION_LIBRARIES += ('z',)
+ 
+ DEFINE_MACROS = (
+     ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),

diff --git a/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch b/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch
new file mode 100644
index 00000000000..c2e20f3994f
--- /dev/null
+++ b/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch
@@ -0,0 +1,52 @@
+From 78a6e04ec1efc2dc839f0329dcff732940e27fd9 Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold <tbechtold@suse.com>
+Date: Fri, 25 May 2018 07:08:05 +0200
+Subject: [PATCH] Allow building the python module with system cares
+
+When building the python module and using the new
+GRPC_PYTHON_BUILD_SYSTEM_CARES env variable, the third party cares code
+is not compiled. Instead, the cares shared library installed on the
+system is used during runtime.
+This is useful for distributions who don't want to include code copies
+but use shared libraries instead.
+---
+ setup.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 483d3ac1682..43c25aafeb9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -96,6 +96,12 @@
+ BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
+                                         False)
+ 
++# Export this variable to use the system installation of cares. You need to
++# have the header files installed (in /usr/include/) and during
++# runtime, the shared libary must be installed
++BUILD_WITH_SYSTEM_CARES = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_CARES',
++                                         False)
++
+ # Environment variable to determine whether or not to enable coverage analysis
+ # in Cython modules.
+ ENABLE_CYTHON_TRACING = os.environ.get(
+@@ -169,6 +175,10 @@
+   CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES)
+   ZLIB_INCLUDE = (os.path.join('/usr', 'include'),)
+ 
++if BUILD_WITH_SYSTEM_CARES:
++  CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
++  CARES_INCLUDE = (os.path.join('/usr', 'include'),)
++
+ EXTENSION_INCLUDE_DIRECTORIES = (
+     (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
+     CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
+@@ -184,6 +194,8 @@
+   EXTENSION_LIBRARIES += ('ssl', 'crypto',)
+ if BUILD_WITH_SYSTEM_ZLIB:
+   EXTENSION_LIBRARIES += ('z',)
++if BUILD_WITH_SYSTEM_CARES:
++  EXTENSION_LIBRARIES += ('cares',)
+ 
+ DEFINE_MACROS = (
+     ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),

diff --git a/net-libs/grpc/grpc-1.12.1.ebuild b/net-libs/grpc/grpc-1.12.1.ebuild
new file mode 100644
index 00000000000..774c0518b1d
--- /dev/null
+++ b/net-libs/grpc/grpc-1.12.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+# should match pinned git submodule version of third_party/protobuf
+# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
+PROTOBUF_VERSION="3.5.2"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="http://www.grpc.io"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc python systemtap tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.5:=
+	dev-util/google-perftools
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+	python? ( ${PYTHON_DEPS}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+		doc? (
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		)
+	)
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch"
+	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/0006-grpc-1.12.1-allow-system-openssl.patch"
+	"${FILESDIR}/0007-grpc-1.12.1-allow-system-zlib.patch"
+	"${FILESDIR}/0008-grpc-1.12.1-allow-system-cares.patch"
+)
+
+src_prepare() {
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+	default
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare() {
+	if use tools; then
+		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
+		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		# absolute symlinks will fail because out-of-source build
+		# ./src -> ${S}/src
+		ln -s ../../../../src ./ || die
+		# ./third_party -> ${S}/third_party
+		ln -s ../../../../third_party ./ || die
+		# ./grpc_root -> ${S}
+		ln -s ../../../../ ./grpc_root || die
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+	emake \
+		V=1 \
+		prefix=/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		AR="$(tc-getAR)" \
+		AROPTS="rcs" \
+		CFLAGS="${CFLAGS}" \
+		LD="${CC}" \
+		LDXX="${CXX}" \
+		STRIP=true \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		HOST_CXX="$(tc-getBUILD_CXX)" \
+		HOST_LD="$(tc-getBUILD_CC)" \
+		HOST_LDXX="$(tc-getBUILD_CXX)" \
+		HOST_AR="$(tc-getBUILD_AR)" \
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+
+	use python && distutils-r1_src_compile
+}
+
+python_compile() {
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+
+	if use tools; then
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		distutils-r1_python_compile
+		popd >/dev/null || die
+	fi
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py doc
+		mv doc/build doc/html || die
+	fi
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		STRIP=true \
+		install
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use doc && local DOCS=( AUTHORS README.md doc/. )
+	einstalldocs
+
+	use python && distutils-r1_src_install
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use tools; then
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		distutils-r1_python_install
+		popd >/dev/null || die
+	fi
+}

diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 13bfd9fea3d..ccdf17cc01e 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -4,7 +4,18 @@
 	<maintainer type="person">
 		<email>perfinion@gentoo.org</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>ya@sysdump.net</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<longdescription lang="en">
 		A high performance, open-source universal RPC framework
 	</longdescription>
+	<use>
+		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="tools">Install gRPC python tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">grpc/grpc</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2018-06-30  8:06 Georgy Yakovlev
  0 siblings, 0 replies; 15+ messages in thread
From: Georgy Yakovlev @ 2018-06-30  8:06 UTC (permalink / raw
  To: gentoo-commits

commit:     20ebf5fa76c976d8ba2670277ee4c24e6cd3575c
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 08:04:53 2018 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 08:06:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ebf5fa

net-libs/grpc: version bump to 1.13.0

Fix protobuf plugins not respecting CFLAGS

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-libs/grpc/Manifest                             |   1 +
 .../0001-grpc-1.13.0-fix-host-ar-handling.patch    |  47 ++++++
 net-libs/grpc/grpc-1.13.0.ebuild                   | 171 +++++++++++++++++++++
 3 files changed, 219 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index cd8bbcbf7ef..93ed53e4b94 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,3 +1,4 @@
 DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
 DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
+DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181

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
new file mode 100644
index 00000000000..926952f47f2
--- /dev/null
+++ b/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
@@ -0,0 +1,47 @@
+From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 30 Jun 2018 00:21:53 -0700
+Subject: [PATCH] Makefile: fix host ar handling
+
+Cherry picked lines from
+https://github.com/grpc/grpc/pull/11476
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8333858588..b5a44b7096 100644
+--- a/Makefile
++++ b/Makefile
+@@ -328,6 +328,7 @@ HOST_CC ?= $(CC)
+ HOST_CXX ?= $(CXX)
+ HOST_LD ?= $(LD)
+ HOST_LDXX ?= $(LDXX)
++HOST_AR ?= $(AR)
+ 
+ CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
+ CXXFLAGS += -std=c++11
+@@ -444,6 +445,7 @@ HOST_CFLAGS = $(CFLAGS)
+ HOST_CXXFLAGS = $(CXXFLAGS)
+ HOST_LDFLAGS = $(LDFLAGS)
+ HOST_LDLIBS = $(LDLIBS)
++HOST_AROPTS = $(AROPTS)
+ 
+ # These are automatically computed variables.
+ # There shouldn't be any need to change anything from now on.
+@@ -6886,10 +6888,10 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
+ else
+ 
+ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
+-	$(E) "[AR]      Creating $@"
++	$(E) "[HOSTAR]  Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
++	$(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
+ endif
+-- 
+2.18.0
+

diff --git a/net-libs/grpc/grpc-1.13.0.ebuild b/net-libs/grpc/grpc-1.13.0.ebuild
new file mode 100644
index 00000000000..ff81aa55ff0
--- /dev/null
+++ b/net-libs/grpc/grpc-1.13.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+# should match pinned git submodule version of third_party/protobuf
+# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
+# also should ~depend on same version of dev-libs/protobuf below
+PROTOBUF_VERSION="3.5.2"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="http://www.grpc.io"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc python systemtap static-libs tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	~dev-libs/protobuf-${PROTOBUF_VERSION}:=
+	dev-util/google-perftools
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+	python? ( ${PYTHON_DEPS}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+	)
+	systemtap? ( dev-util/systemtap )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		python? (
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
+)
+
+src_prepare() {
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+	default
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare() {
+	if use tools; then
+		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
+		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		# absolute symlinks will fail
+		# ./src -> ${S}/src
+		ln -s ../../../../src ./ || die
+		# ./third_party -> ${S}/third_party
+		ln -s ../../../../third_party ./ || die
+		# ./grpc_root -> ${S}
+		ln -s ../../../../ ./grpc_root || die
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	emake \
+		V=1 \
+		prefix=/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		AR="$(tc-getAR)" \
+		AROPTS="rcs" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LD="${CC}" \
+		LDXX="${CXX}" \
+		STRIP=/bin/true \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		HOST_CXX="$(tc-getBUILD_CXX)" \
+		HOST_LD="$(tc-getBUILD_CC)" \
+		HOST_LDXX="$(tc-getBUILD_CXX)" \
+		HOST_AR="$(tc-getBUILD_AR)" \
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+
+	use python && distutils-r1_src_compile
+}
+
+python_compile() {
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+
+	if use tools; then
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		distutils-r1_python_compile
+		popd >/dev/null || die
+	fi
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py doc
+		mv doc/build doc/html || die
+	fi
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		STRIP=/bin/true \
+		install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS README.md doc/. )
+	fi
+
+	einstalldocs
+
+	use python && distutils-r1_src_install
+
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use tools; then
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		distutils-r1_python_install
+		popd >/dev/null || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2018-09-12 18:57 Georgy Yakovlev
  0 siblings, 0 replies; 15+ messages in thread
From: Georgy Yakovlev @ 2018-09-12 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     7c3ea02725492bbb3d7ce9bdea1d4b44305c69d8
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 18:38:44 2018 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 18:56:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c3ea027

net-libs/grpc: version bump to 1.15.0

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-libs/grpc/Manifest                             |   2 +
 .../files/grpc-1.15.0-fix-cpp-so-version.patch     |  70 +++++++++
 net-libs/grpc/grpc-1.15.0.ebuild                   | 173 +++++++++++++++++++++
 3 files changed, 245 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 2f11312e5db..565aa5cecfb 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -3,4 +3,6 @@ DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b73
 DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
 DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356
 DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385
+DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839

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
new file mode 100644
index 00000000000..ba2ca651f0c
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
@@ -0,0 +1,70 @@
+From a443abbdbbd402951138bb8fcb2a4f159b920fcd Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 12 Sep 2018 11:22:48 -0700
+Subject: [PATCH] Fix cpp soname symlinks
+
+---
+ Makefile | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4e993782ee..09bd52e8ad 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3050,7 +3050,7 @@ install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-con
+ ifeq ($(SYSTEM),MINGW32)
+ 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.a
+ else ifneq ($(SYSTEM),Darwin)
+-	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.6
++	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.1
+ 	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so
+ endif
+ 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
+@@ -3059,7 +3059,7 @@ endif
+ ifeq ($(SYSTEM),MINGW32)
+ 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.a
+ else ifneq ($(SYSTEM),Darwin)
+-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.6
++	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.1
+ 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so
+ endif
+ 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
+@@ -3068,7 +3068,7 @@ endif
+ ifeq ($(SYSTEM),MINGW32)
+ 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.a
+ else ifneq ($(SYSTEM),Darwin)
+-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.6
++	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.1
+ 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so
+ endif
+ 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
+@@ -3077,7 +3077,7 @@ endif
+ ifeq ($(SYSTEM),MINGW32)
+ 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.a
+ else ifneq ($(SYSTEM),Darwin)
+-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.6
++	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.1
+ 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so
+ endif
+ 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
+@@ -3086,7 +3086,7 @@ endif
+ ifeq ($(SYSTEM),MINGW32)
+ 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.a
+ else ifneq ($(SYSTEM),Darwin)
+-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.6
++	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
+ 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
+ endif
+ 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
+@@ -3095,7 +3095,7 @@ endif
+ ifeq ($(SYSTEM),MINGW32)
+ 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.a
+ else ifneq ($(SYSTEM),Darwin)
+-	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.6
++	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.1
+ 	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so
+ endif
+ ifneq ($(SYSTEM),MINGW32)
+--
+2.18.0
+

diff --git a/net-libs/grpc/grpc-1.15.0.ebuild b/net-libs/grpc/grpc-1.15.0.ebuild
new file mode 100644
index 00000000000..7c59fdc3076
--- /dev/null
+++ b/net-libs/grpc/grpc-1.15.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+# should match pinned git submodule version of third_party/protobuf
+# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
+# also should >=depend on same version of dev-libs/protobuf below
+PROTOBUF_VERSION="3.6.1"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="http://www.grpc.io"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc python systemtap static-libs tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-${PROTOBUF_VERSION}:=
+	dev-util/google-perftools
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+	python? ( ${PYTHON_DEPS}
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+		tools? ( >=dev-python/protobuf-python-${PROTOBUF_VERSION}:=[${PYTHON_USEDEP}] )
+	)
+	systemtap? ( dev-util/systemtap )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		python? (
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.14.2-gcc8-fixes.patch"
+	"${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
+)
+
+src_prepare() {
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+	default
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare() {
+	if use tools; then
+		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
+		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		# absolute symlinks will fail
+		# ./src -> ${S}/src
+		ln -s ../../../../src ./ || die
+		# ./third_party -> ${S}/third_party
+		ln -s ../../../../third_party ./ || die
+		# ./grpc_root -> ${S}
+		ln -s ../../../../ ./grpc_root || die
+		# prevent above symlinks creating huge SOURCES.TXT files, bug #661244
+		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	emake \
+		V=1 \
+		prefix=/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		AR="$(tc-getAR)" \
+		AROPTS="rcs" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LD="${CC}" \
+		LDXX="${CXX}" \
+		STRIP=/bin/true \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		HOST_CXX="$(tc-getBUILD_CXX)" \
+		HOST_LD="$(tc-getBUILD_CC)" \
+		HOST_LDXX="$(tc-getBUILD_CXX)" \
+		HOST_AR="$(tc-getBUILD_AR)" \
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+
+	use python && distutils-r1_src_compile
+}
+
+python_compile() {
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+
+	if use tools; then
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		distutils-r1_python_compile
+		popd >/dev/null || die
+	fi
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py doc
+		mv doc/build doc/html || die
+	fi
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
+		STRIP=/bin/true \
+		install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# only define DOCS array if requested, otherwise portage default is fine
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+
+	use python && distutils-r1_src_install
+
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use tools; then
+		pushd tools/distrib/python/grpcio_tools >/dev/null || die
+		distutils-r1_python_install
+		popd >/dev/null || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2019-05-28  4:53 Georgy Yakovlev
  0 siblings, 0 replies; 15+ messages in thread
From: Georgy Yakovlev @ 2019-05-28  4:53 UTC (permalink / raw
  To: gentoo-commits

commit:     0821706ecec5ef6e1d5d63597ade79fcc0715c07
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 04:46:19 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue May 28 04:52:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0821706e

net-libs/grpc: bump to 1.21.1

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-libs/grpc/Manifest                             |   1 +
 .../grpc/files/1.21.0-fix-host-ar-handling.patch   | 864 +++++++++++++++++++++
 net-libs/grpc/grpc-1.21.1.ebuild                   | 112 +++
 net-libs/grpc/metadata.xml                         |   1 +
 4 files changed, 978 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 76c1f14d565..daffd2305a6 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -9,5 +9,6 @@ DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c
 DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
 DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7 SHA512 6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
+DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839

diff --git a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
new file mode 100644
index 00000000000..174985097f4
--- /dev/null
+++ b/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
@@ -0,0 +1,864 @@
+From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 22 May 2019 23:04:28 -0700
+Subject: [PATCH] Makefile: fix host ar handling
+
+picked lines from
+https://github.com/grpc/grpc/pull/11476
+---
+ Makefile | 236 ++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 119 insertions(+), 117 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 67495f2..e1c741c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -346,6 +346,7 @@ HOST_CC ?= $(CC)
+ HOST_CXX ?= $(CXX)
+ HOST_LD ?= $(LD)
+ HOST_LDXX ?= $(LDXX)
++HOST_AR ?= $(AR)
+ 
+ CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
+ CXXFLAGS += -std=c++11
+@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS)
+ HOST_CXXFLAGS += $(CXXFLAGS)
+ HOST_LDFLAGS += $(LDFLAGS)
+ HOST_LDLIBS += $(LDLIBS)
++HOST_AROPTS = $(AROPTS)
+ 
+ # These are automatically computed variables.
+ # There shouldn't be any need to change anything from now on.
+@@ -2581,12 +2583,12 @@ $(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/channelz/channelz.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc: src/proto/grpc/channelz/channelz.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc: src/proto/grpc/channelz/channelz.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/channelz/channelz.grpc.pb.cc: src/proto/grpc/channelz/channelz.proto $(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/channelz/channelz.grpc.pb.cc: src/proto/grpc/channelz/channelz.proto $(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2597,12 +2599,12 @@ $(GENDIR)/src/proto/grpc/core/stats.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/core/stats.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/core/stats.pb.cc: src/proto/grpc/core/stats.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/core/stats.pb.cc: src/proto/grpc/core/stats.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/core/stats.grpc.pb.cc: src/proto/grpc/core/stats.proto $(GENDIR)/src/proto/grpc/core/stats.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/core/stats.grpc.pb.cc: src/proto/grpc/core/stats.proto $(GENDIR)/src/proto/grpc/core/stats.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2613,12 +2615,12 @@ $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/health/v1/health.pb.cc: src/proto/grpc/health/v1/health.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/health/v1/health.pb.cc: src/proto/grpc/health/v1/health.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc: src/proto/grpc/health/v1/health.proto $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc: src/proto/grpc/health/v1/health.proto $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2629,12 +2631,12 @@ $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc: src/proto/grpc/lb/v1/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc: src/proto/grpc/lb/v1/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc: src/proto/grpc/lb/v1/load_balancer.proto $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc: src/proto/grpc/lb/v1/load_balancer.proto $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2645,12 +2647,12 @@ $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc: src/proto/grpc/reflection/v1alpha/reflection.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc: src/proto/grpc/reflection/v1alpha/reflection.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc: src/proto/grpc/reflection/v1alpha/reflection.proto $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc: src/proto/grpc/reflection/v1alpha/reflection.proto $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2661,12 +2663,12 @@ $(GENDIR)/src/proto/grpc/status/status.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/status/status.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/status/status.pb.cc: src/proto/grpc/status/status.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/status/status.pb.cc: src/proto/grpc/status/status.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/status/status.grpc.pb.cc: src/proto/grpc/status/status.proto $(GENDIR)/src/proto/grpc/status/status.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/status/status.grpc.pb.cc: src/proto/grpc/status/status.proto $(GENDIR)/src/proto/grpc/status/status.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2694,12 +2696,12 @@ $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc: protoc_dep_error
+ else
+ 
+ 
+-$(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc: src/proto/grpc/testing/compiler_test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc: src/proto/grpc/testing/compiler_test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc: src/proto/grpc/testing/compiler_test.proto $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc: src/proto/grpc/testing/compiler_test.proto $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=generate_mock_code=true:$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2759,12 +2761,12 @@ $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc: src/proto/grpc/testing/echo_messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc: src/proto/grpc/testing/echo_messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc: src/proto/grpc/testing/echo_messages.proto $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc: src/proto/grpc/testing/echo_messages.proto $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2775,12 +2777,12 @@ $(GENDIR)/src/proto/grpc/testing/empty.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/testing/empty.pb.cc: src/proto/grpc/testing/empty.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/empty.pb.cc: src/proto/grpc/testing/empty.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc: src/proto/grpc/testing/empty.proto $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc: src/proto/grpc/testing/empty.proto $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2791,12 +2793,12 @@ $(GENDIR)/src/proto/grpc/testing/messages.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/testing/messages.pb.cc: src/proto/grpc/testing/messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/messages.pb.cc: src/proto/grpc/testing/messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc: src/proto/grpc/testing/messages.proto $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc: src/proto/grpc/testing/messages.proto $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2807,12 +2809,12 @@ $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/testing/metrics.pb.cc: src/proto/grpc/testing/metrics.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/metrics.pb.cc: src/proto/grpc/testing/metrics.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc: src/proto/grpc/testing/metrics.proto $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc: src/proto/grpc/testing/metrics.proto $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2823,12 +2825,12 @@ $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/testing/payloads.pb.cc: src/proto/grpc/testing/payloads.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/payloads.pb.cc: src/proto/grpc/testing/payloads.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc: src/proto/grpc/testing/payloads.proto $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc: src/proto/grpc/testing/payloads.proto $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -2855,12 +2857,12 @@ $(GENDIR)/src/proto/grpc/testing/simple_messages.pb.cc: protoc_dep_error
+ $(GENDIR)/src/proto/grpc/testing/simple_messages.grpc.pb.cc: protoc_dep_error
+ else
+ 
+-$(GENDIR)/src/proto/grpc/testing/simple_messages.pb.cc: src/proto/grpc/testing/simple_messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/simple_messages.pb.cc: src/proto/grpc/testing/simple_messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
+ 
+-$(GENDIR)/src/proto/grpc/testing/simple_messages.grpc.pb.cc: src/proto/grpc/testing/simple_messages.proto $(GENDIR)/src/proto/grpc/testing/simple_messages.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
++$(GENDIR)/src/proto/grpc/testing/simple_messages.grpc.pb.cc: src/proto/grpc/testing/simple_messages.proto $(GENDIR)/src/proto/grpc/testing/simple_messages.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS)
+ 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
+@@ -3215,11 +3217,11 @@ PUBLIC_HEADERS_C += \
+ LIBADDRESS_SORTING_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBADDRESS_SORTING_SRC))))
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libaddress_sorting.a:  $(LIBADDRESS_SORTING_OBJS) 
++$(LIBDIR)/$(CONFIG)/libaddress_sorting.a:  $(LIBADDRESS_SORTING_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libaddress_sorting.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBADDRESS_SORTING_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBADDRESS_SORTING_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libaddress_sorting.a
+ endif
+@@ -3268,11 +3270,11 @@ $(LIBDIR)/$(CONFIG)/libalts_test_util.a: openssl_dep_error
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libalts_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBALTS_TEST_UTIL_OBJS) 
++$(LIBDIR)/$(CONFIG)/libalts_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBALTS_TEST_UTIL_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libalts_test_util.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libalts_test_util.a $(LIBALTS_TEST_UTIL_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libalts_test_util.a $(LIBALTS_TEST_UTIL_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libalts_test_util.a
+ endif
+@@ -3316,11 +3318,11 @@ LIBCXXABI_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(
+ $(LIBCXXABI_OBJS): CPPFLAGS += -D_LIBCPP_DISABLE_EXTERN_TEMPLATE -D_LIBCXXABI_BUILDING_LIBRARY -D_LIBCXXABI_NO_EXCEPTIONS -Ithird_party/libcxxabi/include -nostdinc++ -Ithird_party/libcxx/include $(W_NO_UNUSED_BUT_SET_VARIABLE) $(W_NO_MAYBE_UNINITIALIZED) -fvisibility=hidden
+ $(LIBCXXABI_OBJS): CXXFLAGS += $(W_NO_CXX14_COMPAT)
+ 
+-$(LIBDIR)/$(CONFIG)/libcxxabi.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBCXXABI_OBJS) 
++$(LIBDIR)/$(CONFIG)/libcxxabi.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBCXXABI_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libcxxabi.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libcxxabi.a $(LIBCXXABI_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libcxxabi.a $(LIBCXXABI_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libcxxabi.a
+ endif
+@@ -3411,11 +3413,11 @@ PUBLIC_HEADERS_C += \
+ LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC))))
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBGPR_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBGPR_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBGPR_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBGPR_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgpr.a
+ endif
+@@ -3836,11 +3838,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc.a
+ endif
+@@ -4217,11 +4219,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_E
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBGRPC_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBGRPC_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
+ endif
+@@ -4556,11 +4558,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: openssl_dep_error
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_TEST_UTIL_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_TEST_UTIL_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBGRPC_TEST_UTIL_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBGRPC_TEST_UTIL_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
+ endif
+@@ -4863,11 +4865,11 @@ PUBLIC_HEADERS_C += \
+ LIBGRPC_TEST_UTIL_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_UNSECURE_SRC))))
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
+ endif
+@@ -5183,11 +5185,11 @@ PUBLIC_HEADERS_C += \
+ LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC))))
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBGRPC_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBGRPC_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
+ endif
+@@ -5235,11 +5237,11 @@ $(LIBDIR)/$(CONFIG)/libreconnect_server.a: openssl_dep_error
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBRECONNECT_SERVER_OBJS) 
++$(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBRECONNECT_SERVER_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libreconnect_server.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBRECONNECT_SERVER_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBRECONNECT_SERVER_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libreconnect_server.a
+ endif
+@@ -5274,11 +5276,11 @@ $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: openssl_dep_error
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBTEST_TCP_SERVER_OBJS) 
++$(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBTEST_TCP_SERVER_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBTEST_TCP_SERVER_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBTEST_TCP_SERVER_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
+ endif
+@@ -5321,11 +5323,11 @@ $(LIBDIR)/$(CONFIG)/libdns_test_util.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libdns_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDNS_TEST_UTIL_OBJS) 
++$(LIBDIR)/$(CONFIG)/libdns_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDNS_TEST_UTIL_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libdns_test_util.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libdns_test_util.a $(LIBDNS_TEST_UTIL_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libdns_test_util.a $(LIBDNS_TEST_UTIL_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libdns_test_util.a
+ endif
+@@ -5662,11 +5664,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBGRPC++_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBGRPC++_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++.a
+ endif
+@@ -5729,11 +5731,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBGRPC++_CORE_STATS_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBGRPC++_CORE_STATS_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a
+ endif
+@@ -6281,11 +6283,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a $(LIBGRPC++_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a $(LIBGRPC++_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a
+ endif
+@@ -6353,11 +6355,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ERROR_DETAILS_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ERROR_DETAILS_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBGRPC++_ERROR_DETAILS_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBGRPC++_ERROR_DETAILS_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
+ endif
+@@ -6423,11 +6425,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a
+ endif
+@@ -6480,11 +6482,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHA
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBGRPC++_REFLECTION_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBGRPC++_REFLECTION_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a
+ endif
+@@ -6548,11 +6550,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBGRPC++_TEST_CONFIG_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBGRPC++_TEST_CONFIG_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
+ endif
+@@ -6713,11 +6715,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBGRPC++_TEST_UTIL_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBGRPC++_TEST_UTIL_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a
+ endif
+@@ -6883,11 +6885,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a
+ endif
+@@ -7209,11 +7211,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARE
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBGRPC++_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBGRPC++_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(ADDRESS_SORTING_MERGE_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
+ endif
+@@ -7272,11 +7274,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBGRPC_BENCHMARK_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBGRPC_BENCHMARK_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a
+ endif
+@@ -7328,11 +7330,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBGRPC_CLI_LIBS_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBGRPC_CLI_LIBS_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a
+ endif
+@@ -7381,11 +7383,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
+-	$(E) "[AR]      Creating $@"
++$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
++	$(E) "[HOSTAR]  Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
++	$(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
+ endif
+@@ -7432,11 +7434,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARE
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPCPP_CHANNELZ_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPCPP_CHANNELZ_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a $(LIBGRPCPP_CHANNELZ_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a $(LIBGRPCPP_CHANNELZ_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a
+ endif
+@@ -7503,11 +7505,11 @@ $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS) 
++$(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a $(LIBHTTP2_CLIENT_MAIN_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a $(LIBHTTP2_CLIENT_MAIN_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a
+ endif
+@@ -7554,11 +7556,11 @@ $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS) 
++$(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBINTEROP_CLIENT_HELPER_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBINTEROP_CLIENT_HELPER_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a
+ endif
+@@ -7608,11 +7610,11 @@ $(LIBDIR)/$(CONFIG)/libinterop_client_main.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS) 
++$(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_main.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBINTEROP_CLIENT_MAIN_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBINTEROP_CLIENT_MAIN_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_client_main.a
+ endif
+@@ -7659,11 +7661,11 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS) 
++$(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBINTEROP_SERVER_HELPER_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBINTEROP_SERVER_HELPER_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a
+ endif
+@@ -7711,11 +7713,11 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS) 
++$(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBINTEROP_SERVER_LIB_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBINTEROP_SERVER_LIB_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a
+ endif
+@@ -7761,11 +7763,11 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_main.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS) 
++$(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_main.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBINTEROP_SERVER_MAIN_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBINTEROP_SERVER_MAIN_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_server_main.a
+ endif
+@@ -7829,11 +7831,11 @@ $(LIBDIR)/$(CONFIG)/libqps.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS) 
++$(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libqps.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBQPS_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBQPS_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libqps.a
+ endif
+@@ -7884,11 +7886,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SH
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_CSHARP_EXT_OBJS) 
++$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_CSHARP_EXT_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a $(LIBGRPC_CSHARP_EXT_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a $(LIBGRPC_CSHARP_EXT_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a
+ endif
+@@ -8189,11 +8191,11 @@ $(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=h
+ $(LIBBORINGSSL_OBJS): CXXFLAGS += -fno-rtti -fno-exceptions
+ $(LIBBORINGSSL_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare -Wno-implicit-fallthrough $(NO_W_EXTRA_SEMI)
+ 
+-$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBBORINGSSL_OBJS) 
++$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBBORINGSSL_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl.a $(LIBBORINGSSL_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl.a $(LIBBORINGSSL_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl.a
+ endif
+@@ -8228,11 +8230,11 @@ $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS) 
++$(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBBORINGSSL_TEST_UTIL_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBBORINGSSL_TEST_UTIL_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a
+ endif
+@@ -8280,11 +8282,11 @@ $(LIBDIR)/$(CONFIG)/libbenchmark.a: protobuf_dep_error
+ 
+ else
+ 
+-$(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS) 
++$(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libbenchmark.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBBENCHMARK_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBBENCHMARK_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libbenchmark.a
+ endif
+@@ -8317,11 +8319,11 @@ LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIB
+ 
+ $(LIBUPB_OBJS): CFLAGS += -Ithird_party/upb -Wno-sign-conversion -Wno-shadow -Wno-conversion -Wno-implicit-fallthrough -Wno-sign-compare -Wno-missing-field-initializers
+ 
+-$(LIBDIR)/$(CONFIG)/libupb.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBUPB_OBJS) 
++$(LIBDIR)/$(CONFIG)/libupb.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBUPB_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libupb.a
+ endif
+@@ -8357,11 +8359,11 @@ LIBZ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBZ_
+ 
+ $(LIBZ_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration -Wno-implicit-fallthrough $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden
+ 
+-$(LIBDIR)/$(CONFIG)/libz.a:  $(LIBZ_OBJS) 
++$(LIBDIR)/$(CONFIG)/libz.a:  $(LIBZ_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libz.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libz.a $(LIBZ_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libz.a $(LIBZ_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libz.a
+ endif
+@@ -8433,11 +8435,11 @@ LIBARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LI
+ $(LIBARES_OBJS): CPPFLAGS += -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
+ $(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion $(if $(subst Darwin,,$(SYSTEM)),,-Wno-shorten-64-to-32) $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,)
+ 
+-$(LIBDIR)/$(CONFIG)/libares.a:  $(LIBARES_OBJS) 
++$(LIBDIR)/$(CONFIG)/libares.a:  $(LIBARES_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libares.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libares.a $(LIBARES_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libares.a $(LIBARES_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libares.a
+ endif
+@@ -8468,11 +8470,11 @@ $(LIBDIR)/$(CONFIG)/libbad_client_test.a: openssl_dep_error
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBAD_CLIENT_TEST_OBJS) 
++$(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBAD_CLIENT_TEST_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_client_test.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBBAD_CLIENT_TEST_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBBAD_CLIENT_TEST_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libbad_client_test.a
+ endif
+@@ -8507,11 +8509,11 @@ $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: openssl_dep_error
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS) 
++$(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBBAD_SSL_TEST_SERVER_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBBAD_SSL_TEST_SERVER_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a
+ endif
+@@ -8625,11 +8627,11 @@ $(LIBDIR)/$(CONFIG)/libend2end_tests.a: openssl_dep_error
+ else
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBEND2END_TESTS_OBJS) 
++$(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBEND2END_TESTS_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_tests.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBEND2END_TESTS_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBEND2END_TESTS_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libend2end_tests.a
+ endif
+@@ -8732,11 +8734,11 @@ PUBLIC_HEADERS_C += \
+ LIBEND2END_NOSEC_TESTS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBEND2END_NOSEC_TESTS_SRC))))
+ 
+ 
+-$(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBEND2END_NOSEC_TESTS_OBJS) 
++$(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(LIBEND2END_NOSEC_TESTS_OBJS)
+ 	$(E) "[AR]      Creating $@"
+ 	$(Q) mkdir -p `dirname $@`
+ 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
+-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBEND2END_NOSEC_TESTS_OBJS) 
++	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBEND2END_NOSEC_TESTS_OBJS)
+ ifeq ($(SYSTEM),Darwin)
+ 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
+ endif
+@@ -19812,7 +19814,7 @@ $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTE
+ 
+ endif
+ 
+-$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o: 
++$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o:
+ 
+ deps_gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep)
+ 
+@@ -19844,7 +19846,7 @@ $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables: $(GEN_PERCENT_ENCODING_TABLES_O
+ 
+ endif
+ 
+-$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_percent_encoding_tables.o: 
++$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_percent_encoding_tables.o:
+ 
+ deps_gen_percent_encoding_tables: $(GEN_PERCENT_ENCODING_TABLES_OBJS:.o=.dep)
+ 
+-- 
+2.21.0
+

diff --git a/net-libs/grpc/grpc-1.21.1.ebuild b/net-libs/grpc/grpc-1.21.1.ebuild
new file mode 100644
index 00000000000..79d4eff6fd6
--- /dev/null
+++ b/net-libs/grpc/grpc-1.21.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	dev-libs/protobuf:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}

diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 5a11d0f4a2d..3a3bfdc3d72 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -12,6 +12,7 @@
 		A high performance, open-source universal RPC framework
 	</longdescription>
 	<use>
+		<flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="tools">Install gRPC python tools</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2019-07-14  1:10 Georgy Yakovlev
  0 siblings, 0 replies; 15+ messages in thread
From: Georgy Yakovlev @ 2019-07-14  1:10 UTC (permalink / raw
  To: gentoo-commits

commit:     5ff24c4e16ffa9d4c145909ecd43dcd8b4830fc8
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 01:01:00 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 01:10:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff24c4e

net-libs/grpc: bump to 1.22.0

Closes: https://bugs.gentoo.org/688646
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-libs/grpc/Manifest                             |   1 +
 .../1.22.0-cxx_arg_list_too_long_forloop.patch     |  44 ++++++++
 net-libs/grpc/grpc-1.22.0.ebuild                   | 112 +++++++++++++++++++++
 3 files changed, 157 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index daffd2305a6..72a57adaabc 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -10,5 +10,6 @@ DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a95
 DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7 SHA512 6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
 DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
+DIST grpc-1.22.0.tar.gz 15082718 BLAKE2B 679be0488fc02441d5ba555c9150532e6ceb00bbaee9fe8b22881bef8ab713f45f96283f123576738285cfe8d358eb458cac9252bac7766cfd8ee5ac6e97fda9 SHA512 e8181f01bc44dc7e7a9e8c74c0a9c3f25960bb9c88c239e7c75764105ca24ac173bab663130fb6349c7fa43cd57f35dd7927a369482b1e6a73224cb2174bd336
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839

diff --git a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
new file mode 100644
index 00000000000..974d6fcc435
--- /dev/null
+++ b/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
@@ -0,0 +1,44 @@
+--- a/Makefile	2018-06-26 11:07:45.948160976 +0200
++++ b/Makefile	2019-06-26 11:04:25.798966336 +0200
+@@ -2820,13 +2820,15 @@
+ 
+ install-headers_c:
+ 	$(E) "[INSTALL] Installing public C headers"
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++	$(Q) for h in $(PUBLIC_HEADERS_C); do \
++	$(INSTALL) -D $$h $(prefix)/$$h ; \
++	done
+ 
+ install-headers_cxx:
+ 	$(E) "[INSTALL] Installing public C++ headers"
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
++	$(INSTALL) -D $$h $(prefix)/$$h ; \
++	done
+ 
+ install-static: install-static_c install-static_cxx
+ 
+--- a/templates/Makefile.template	2019-06-26 12:38:36.777292299 +0200
++++ b/templates/Makefile.template	2019-06-26 12:48:35.668550020 +0200
+@@ -1302,13 +1302,15 @@
+ 
+   install-headers_c:
+   	$(E) "[INSTALL] Installing public C headers"
+-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++  	$(Q) for h in $(PUBLIC_HEADERS_C); do \
++  	$(INSTALL) -D $$h $(prefix)/$$h ; \
++  	done
+ 
+   install-headers_cxx:
+   	$(E) "[INSTALL] Installing public C++ headers"
+-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++  	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
++  	$(INSTALL) -D $$h $(prefix)/$$h ; \
++  	done
+ 
+   install-static: install-static_c install-static_cxx
+ 

diff --git a/net-libs/grpc/grpc-1.22.0.ebuild b/net-libs/grpc/grpc-1.22.0.ebuild
new file mode 100644
index 00000000000..04e137d8d78
--- /dev/null
+++ b/net-libs/grpc/grpc-1.22.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.7.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2019-07-27  9:07 Georgy Yakovlev
  0 siblings, 0 replies; 15+ messages in thread
From: Georgy Yakovlev @ 2019-07-27  9:07 UTC (permalink / raw
  To: gentoo-commits

commit:     904bf59fb19a2c1863d86f5f13c69823c538ac83
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 09:06:41 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 09:06:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904bf59f

net-libs/grpc: rename all patches

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 ...-pkgconfig-libdir.patch => grpc-1.11.0-pkgconfig-libdir.patch} | 0
 ...t-ar-handling.patch => grpc-1.13.0-fix-host-ar-handling.patch} | 0
 ...t-ar-handling.patch => grpc-1.21.0-fix-host-ar-handling.patch} | 0
 ...loop.patch => grpc-1.22.0-cxx_arg_list_too_long_forloop.patch} | 0
 ...n-t-run-ldconfig.patch => grpc-1.3.0-Don-t-run-ldconfig.patch} | 0
 net-libs/grpc/grpc-1.16.1.ebuild                                  | 6 +++---
 net-libs/grpc/grpc-1.17.1.ebuild                                  | 6 +++---
 net-libs/grpc/grpc-1.18.0.ebuild                                  | 6 +++---
 net-libs/grpc/grpc-1.19.0.ebuild                                  | 6 +++---
 net-libs/grpc/grpc-1.20.1-r1.ebuild                               | 6 +++---
 net-libs/grpc/grpc-1.21.1-r1.ebuild                               | 6 +++---
 net-libs/grpc/grpc-1.22.0.ebuild                                  | 8 ++++----
 12 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch
similarity index 100%
rename from net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
rename to net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch

diff --git a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
similarity index 100%
rename from net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
rename to net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch

diff --git a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
similarity index 100%
rename from net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
rename to net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch

diff --git a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
similarity index 100%
rename from net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
rename to net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch

diff --git a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
similarity index 100%
rename from net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch
rename to net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch

diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
index f04778edda6..6ab28ceba67 100644
--- a/net-libs/grpc/grpc-1.16.1.ebuild
+++ b/net-libs/grpc/grpc-1.16.1.ebuild
@@ -30,9 +30,9 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
 	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"

diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
index 2774a877762..a5959280313 100644
--- a/net-libs/grpc/grpc-1.17.1.ebuild
+++ b/net-libs/grpc/grpc-1.17.1.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )

diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
index 2774a877762..a5959280313 100644
--- a/net-libs/grpc/grpc-1.18.0.ebuild
+++ b/net-libs/grpc/grpc-1.18.0.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )

diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild
index d944be59c38..a0877fb616b 100644
--- a/net-libs/grpc/grpc-1.19.0.ebuild
+++ b/net-libs/grpc/grpc-1.19.0.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )
 S="${WORKDIR}/${PN}-${MY_PV}"

diff --git a/net-libs/grpc/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild
index f34a772f778..d8c812cd259 100644
--- a/net-libs/grpc/grpc-1.20.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.20.1-r1.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )
 S="${WORKDIR}/${PN}-${MY_PV}"

diff --git a/net-libs/grpc/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild
index f90bab18e1c..bf11250c29c 100644
--- a/net-libs/grpc/grpc-1.21.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.21.1-r1.ebuild
@@ -32,9 +32,9 @@ BDEPEND="virtual/pkgconfig"
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )
 

diff --git a/net-libs/grpc/grpc-1.22.0.ebuild b/net-libs/grpc/grpc-1.22.0.ebuild
index 04e137d8d78..4f597ba8357 100644
--- a/net-libs/grpc/grpc-1.22.0.ebuild
+++ b/net-libs/grpc/grpc-1.22.0.ebuild
@@ -32,10 +32,10 @@ BDEPEND="virtual/pkgconfig"
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2019-11-16  0:31 Georgy Yakovlev
  0 siblings, 0 replies; 15+ messages in thread
From: Georgy Yakovlev @ 2019-11-16  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7d234af969f1bd8037b498ddb44ceb2b516c68a9
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 23:52:13 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 00:20:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d234af9

net-libs/grpc: bump to 1.25.0

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-libs/grpc/Manifest                             |   1 +
 .../grpc/files/grpc-1.25.0-pkgconfig-libdir.patch  |  17 ++++
 net-libs/grpc/grpc-1.25.0.ebuild                   | 112 +++++++++++++++++++++
 3 files changed, 130 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 1254f6798c1..c347eb0907d 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -7,3 +7,4 @@ DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc6
 DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b9e56f8012795000c30f20fa4d5c1bad37d117cf8ea54fb372b8b02702a866c027c6e0a467f276a752ee9d17c6 SHA512 086ceb7a4fc1439bd23a2cab8c90ba2542491d5a9c278a0ff6e1b3ad623cf7725b2a7310bb793d9b36882bd9394d02a3616331ac26c78d822e68b305c2ae27f6
 DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
 DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c
+DIST grpc-1.25.0.tar.gz 16460163 BLAKE2B a581b1db459468e7c01af579da39cc111825931eee21d9af13833b1d65e448ee2024d86edb95e7acb705ad427f793d7911d6fb66418155e75f5e1f0e6116578a SHA512 7d9e126eafdfefe9b5c2eacf9c082b972115f231a55cff53386305f2df68037e2593eedc3f27fe0eaeb7fbe78b28f6b87607cdeccf59929b9a9b33bf74ab5c92

diff --git a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
new file mode 100644
index 00000000000..28088713e5f
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
@@ -0,0 +1,17 @@
+--- a/Makefile	2018-05-28 17:59:34.631540261 +0800
++++ b/Makefile	2018-05-28 18:01:31.266936000 +0800
+@@ -460,11 +460,11 @@
+ CACHE_MK += HAS_PKG_CONFIG = true,
+ endif
+ 
+-CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+-CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+-CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+ ifeq ($(SYSTEM),MINGW32)
+ EXECUTABLE_SUFFIX = .exe

diff --git a/net-libs/grpc/grpc-1.25.0.ebuild b/net-libs/grpc/grpc-1.25.0.ebuild
new file mode 100644
index 00000000000..0a1213a0a71
--- /dev/null
+++ b/net-libs/grpc/grpc-1.25.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.8.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.25.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2020-09-25 22:55 Georgy Yakovlev
  0 siblings, 0 replies; 15+ messages in thread
From: Georgy Yakovlev @ 2020-09-25 22:55 UTC (permalink / raw
  To: gentoo-commits

commit:     f4a04a5c28a13f2d5453847701a43572c5847d8f
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 22:23:58 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 22:55:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a04a5c

net-libs/grpc: bump to 1.32.0

Bug: https://bugs.gentoo.org/744730
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-libs/grpc/Manifest                             |  1 +
 .../grpc/files/use-pkg-config-to-find-re2.patch    | 26 +++++++
 net-libs/grpc/grpc-1.32.0.ebuild                   | 87 ++++++++++++++++++++++
 3 files changed, 114 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index d5b1a49aa2e..7eae7aec32b 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,3 +1,4 @@
 DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61
 DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
 DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
+DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed

diff --git a/net-libs/grpc/files/use-pkg-config-to-find-re2.patch b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch
new file mode 100644
index 00000000000..33712d62ef0
--- /dev/null
+++ b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch
@@ -0,0 +1,26 @@
+From 1f51d47b0ab2c0ac54c27b54f5e8e79910138a02 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 25 Sep 2020 15:10:26 -0700
+Subject: [PATCH] use pkg-config to find re2
+
+---
+ cmake/re2.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/re2.cmake b/cmake/re2.cmake
+index 3e83aae..94dfa5d 100644
+--- a/cmake/re2.cmake
++++ b/cmake/re2.cmake
+@@ -45,7 +45,8 @@ if(gRPC_RE2_PROVIDER STREQUAL "module")
+     set(gRPC_INSTALL FALSE)
+   endif()
+ elseif(gRPC_RE2_PROVIDER STREQUAL "package")
+-  find_package(re2 REQUIRED CONFIG)
++  find_package(PkgConfig REQUIRED)
++  pkg_check_modules(RE2 REQUIRED re2)
+ 
+   if(TARGET re2::re2)
+     set(_gRPC_RE2_LIBRARIES re2::re2)
+-- 
+2.28.0
+

diff --git a/net-libs/grpc/grpc-1.32.0.ebuild b/net-libs/grpc/grpc-1.32.0.ebuild
new file mode 100644
index 00000000000..e76d5389780
--- /dev/null
+++ b/net-libs/grpc/grpc-1.32.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc examples libressl test"
+
+RDEPEND="
+	=dev-cpp/abseil-cpp-20200225*:=
+	dev-libs/re2:=
+	>=dev-libs/protobuf-3.13.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}/use-pkg-config-to-find-re2.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		$(usex test '-DgRPC_GFLAGS_PROVIDER=package' '')
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2020-09-25 23:33 Georgy Yakovlev
  0 siblings, 0 replies; 15+ messages in thread
From: Georgy Yakovlev @ 2020-09-25 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     f594ce23eb9b3df1cc94eb382a5b0e9abb9ffc69
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 23:32:52 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 23:33:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f594ce23

net-libs/grpc: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-libs/grpc/Manifest                             |   2 -
 .../files/grpc-1.21.0-fix-host-ar-handling.patch   |  47 ---------
 ...grpc-1.22.0-cxx_arg_list_too_long_forloop.patch |  44 --------
 .../grpc/files/grpc-1.25.0-pkgconfig-libdir.patch  |  17 ---
 .../grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch |  53 ----------
 net-libs/grpc/grpc-1.26.0-r1.ebuild                | 114 ---------------------
 net-libs/grpc/metadata.xml                         |   4 -
 7 files changed, 281 deletions(-)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 7eae7aec32b..486074e6e56 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,4 +1,2 @@
-DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61
-DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
 DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
 DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed

diff --git a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
deleted file mode 100644
index 213a39a3843..00000000000
--- a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 22 May 2019 23:04:28 -0700
-Subject: [PATCH] Makefile: fix host ar handling
-
-picked lines from
-https://github.com/grpc/grpc/pull/11476
----
- Makefile | 236 ++++++++++++++++++++++++++++---------------------------
- 1 file changed, 119 insertions(+), 117 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 67495f2..e1c741c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -346,6 +346,7 @@ HOST_CC ?= $(CC)
- HOST_CXX ?= $(CXX)
- HOST_LD ?= $(LD)
- HOST_LDXX ?= $(LDXX)
-+HOST_AR ?= $(AR)
-
- CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
- CXXFLAGS += -std=c++11
-@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS)
- HOST_CXXFLAGS += $(CXXFLAGS)
- HOST_LDFLAGS += $(LDFLAGS)
- HOST_LDLIBS += $(LDLIBS)
-+HOST_AROPTS = $(AROPTS)
-
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-
-@@ -7381,11 +7383,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
-
- else
-
--$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
--	$(E) "[AR]      Creating $@"
-+$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+	$(E) "[HOSTAR]  Creating $@"
- 	$(Q) mkdir -p `dirname $@`
- 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
--	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+	$(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
- ifeq ($(SYSTEM),Darwin)
- 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
- endif

diff --git a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
deleted file mode 100644
index 974d6fcc435..00000000000
--- a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Makefile	2018-06-26 11:07:45.948160976 +0200
-+++ b/Makefile	2019-06-26 11:04:25.798966336 +0200
-@@ -2820,13 +2820,15 @@
- 
- install-headers_c:
- 	$(E) "[INSTALL] Installing public C headers"
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) for h in $(PUBLIC_HEADERS_C); do \
-+	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+	done
- 
- install-headers_cxx:
- 	$(E) "[INSTALL] Installing public C++ headers"
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
-+	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+	done
- 
- install-static: install-static_c install-static_cxx
- 
---- a/templates/Makefile.template	2019-06-26 12:38:36.777292299 +0200
-+++ b/templates/Makefile.template	2019-06-26 12:48:35.668550020 +0200
-@@ -1302,13 +1302,15 @@
- 
-   install-headers_c:
-   	$(E) "[INSTALL] Installing public C headers"
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+  	$(Q) for h in $(PUBLIC_HEADERS_C); do \
-+  	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+  	done
- 
-   install-headers_cxx:
-   	$(E) "[INSTALL] Installing public C++ headers"
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+  	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
-+  	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+  	done
- 
-   install-static: install-static_c install-static_cxx
- 

diff --git a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
deleted file mode 100644
index 28088713e5f..00000000000
--- a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile	2018-05-28 17:59:34.631540261 +0800
-+++ b/Makefile	2018-05-28 18:01:31.266936000 +0800
-@@ -460,11 +460,11 @@
- CACHE_MK += HAS_PKG_CONFIG = true,
- endif
- 
--CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
--CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
--CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
- ifeq ($(SYSTEM),MINGW32)
- EXECUTABLE_SUFFIX = .exe

diff --git a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
deleted file mode 100644
index d18063f2ef1..00000000000
--- a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 40f602c0beeb09197507d280b150174e09300d7f Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:26:04 -0700
-Subject: [PATCH 5/5] grpc-1.3.0: Don't run ldconfig
-
-It doesn't make sense to run ldconfig for a staged install.  Remove it.
----
- Makefile | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 86bd66a5e0..f4c2a5bcb9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2582,11 +2582,6 @@ else ifneq ($(SYSTEM),Darwin)
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so.3
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
--	$(Q) ldconfig || true
--endif
--endif
- 
- 
- install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
-@@ -2635,11 +2630,6 @@ else ifneq ($(SYSTEM),Darwin)
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
--	$(Q) ldconfig || true
--endif
--endif
- 
- 
- install-shared_csharp: shared_csharp strip-shared_csharp
-@@ -2652,11 +2642,6 @@ else ifneq ($(SYSTEM),Darwin)
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
--	$(Q) ldconfig || true
--endif
--endif
- 
- 
- install-plugins: $(PROTOC_PLUGINS)
--- 
-2.14.0.rc0.284.gd933b75aa4-goog
-

diff --git a/net-libs/grpc/grpc-1.26.0-r1.ebuild b/net-libs/grpc/grpc-1.26.0-r1.ebuild
deleted file mode 100644
index d9352892adf..00000000000
--- a/net-libs/grpc/grpc-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~gyakovlev/distfiles/grpc-1.26-fix-odr-violation.patch.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.8.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/grpc-1.26-fix-odr-violation.patch" #705574
-	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.25.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	rm -r third_party/cares || die
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	local myemakeargs=(
-		V=1
-		prefix=/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		AR="$(tc-getAR)"
-		AROPTS="rcs"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LD="${CC}"
-		LDXX="${CXX}"
-		STRIP=/bin/true
-		HOST_AR="$(tc-getBUILD_AR)"
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_CXX="$(tc-getBUILD_CXX)"
-		HOST_LD="$(tc-getBUILD_CC)"
-		HOST_LDXX="$(tc-getBUILD_CXX)"
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		V=1
-		prefix="${ED}"/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		STRIP=/bin/true
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}

diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 708220c8696..08613524f7f 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -8,10 +8,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<use>
-		<flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:grpc:grpc</remote-id>
 		<remote-id type="github">grpc/grpc</remote-id>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2021-10-08 18:19 Arthur Zamarin
  0 siblings, 0 replies; 15+ messages in thread
From: Arthur Zamarin @ 2021-10-08 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     6808a5a7420dfa7355ed17d81b0f88d6889f3894
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 14:11:07 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 18:18:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6808a5a7

net-libs/grpc: add 1.41.0

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/grpc/Manifest                             |   1 +
 .../grpc/files/grpc-1.41.0-link-system-gtest.patch |  22 +++++
 net-libs/grpc/grpc-1.41.0.ebuild                   | 102 +++++++++++++++++++++
 3 files changed, 125 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 32327daee54..9ae56077887 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,2 +1,3 @@
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
+DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902

diff --git a/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch b/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch
new file mode 100644
index 00000000000..4901678bfd6
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0e8fbdee8b..3662aabdfe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2309,6 +2309,7 @@ target_include_directories(grpc_test_util
+     ${_gRPC_ZLIB_INCLUDE_DIR}
+ )
+ target_link_libraries(grpc_test_util
++    PRIVATE
+   ${_gRPC_ALLTARGETS_LIBRARIES}
+   absl::failure_signal_handler
+   absl::stacktrace
+@@ -2322,7 +2323,8 @@ endif()
+ 
+ endif()
+ if(gRPC_BUILD_TESTS)
+-
++find_package(GTest REQUIRED)
++target_link_libraries(grpc_test_util PUBLIC GTest::gtest GTest::gmock)
+ add_library(grpc_test_util_unsecure
+   test/core/util/cmdline.cc
+   test/core/util/fuzzer_util.cc

diff --git a/net-libs/grpc/grpc-1.41.0.ebuild b/net-libs/grpc/grpc-1.41.0.ebuild
new file mode 100644
index 00000000000..e9f7052206f
--- /dev/null
+++ b/net-libs/grpc/grpc-1.41.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
+SLOT="0/19.141"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc examples test"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	=dev-cpp/abseil-cpp-20210324*:=
+	>=dev-libs/re2-0.2021.04.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+	>=dev-libs/protobuf-3.17.3:=
+	dev-libs/xxhash
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+soversion_check() {
+	local core_sover cpp_sover
+	# extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION    "1.37")'
+	core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	# remove dots, e.g. 1.37 -> 137
+	core_sover="${core_sover//./}"
+	cpp_sover="${cpp_sover//./}"
+	[[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
+	[[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+	soversion_check
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		-DCMAKE_CXX_STANDARD=17
+		$(usex test '-DgRPC_GFLAGS_PROVIDER=package' '')
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2023-08-21 19:57 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2023-08-21 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     785694f030cc5eeb3d919e37e606a046bac25584
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 19:52:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 19:52:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785694f0

net-libs/grpc: fix CMake module

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch    | 29 ++++++++++++++++++++++
 .../{grpc-1.57.0.ebuild => grpc-1.57.0-r1.ebuild}  |  4 +++
 2 files changed, 33 insertions(+)

diff --git a/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch b/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch
new file mode 100644
index 000000000000..1caa9e9bb8f8
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.57.0-fix-cmake.patch
@@ -0,0 +1,29 @@
+https://github.com/grpc/grpc/pull/33361
+
+From 117dc80eb43021dd5619023ef6d02d0d6ec7ae7a Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Wed, 7 Jun 2023 13:06:49 +0800
+Subject: [PATCH] [Build] fix `gRPCConfig.cmake`
+
+Without this change, calling `find_package(gRPC REQUIRED)` errors out
+with
+
+    CMake Error at /opt/homebrew/lib/cmake/grpc/gRPCConfig.cmake:8 (find_dependency):
+      Unknown CMake command "find_dependency".
+
+The issue is that `find_dependency` is provided by the
+`CMakeFindDependencyMacro` module[^1], so we need to `include` it before
+use.
+
+[^1]: https://cmake.org/cmake/help/v3.26/module/CMakeFindDependencyMacro.html
+--- a/cmake/protobuf.cmake
++++ b/cmake/protobuf.cmake
+@@ -86,6 +86,6 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")
+         set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
+       endif()
+     endif()
+-    set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf CONFIG)")
++    set(_gRPC_FIND_PROTOBUF "include(CMakeFindDependencyMacro)\nfind_dependency(Protobuf CONFIG)")
+   endif()
+ endif()
+

diff --git a/net-libs/grpc/grpc-1.57.0.ebuild b/net-libs/grpc/grpc-1.57.0-r1.ebuild
similarity index 98%
rename from net-libs/grpc/grpc-1.57.0.ebuild
rename to net-libs/grpc/grpc-1.57.0-r1.ebuild
index 77e08df80530..3b44163c341f 100644
--- a/net-libs/grpc/grpc-1.57.0.ebuild
+++ b/net-libs/grpc/grpc-1.57.0-r1.ebuild
@@ -43,6 +43,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.57.0-fix-cmake.patch
+)
+
 soversion_check() {
 	local core_sover cpp_sover
 	# extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION    "1.37")'


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2024-07-01 19:01 Arthur Zamarin
  0 siblings, 0 replies; 15+ messages in thread
From: Arthur Zamarin @ 2024-07-01 19:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b30702ef7ad55579b807ede336c6a4603c726bc3
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Fri May 17 05:03:59 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 19:01:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30702ef

net-libs/grpc: add 1.62.1, wire up tests

There are newer releases available but this is the latest that does not
require abseil-cpp bump.  Not investigating every single failure right
now as even with all the exclusions this still plugs in 500+ tests that
were not there before.

Closes: https://bugs.gentoo.org/927403
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/36711
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/grpc/Manifest                             |   1 +
 net-libs/grpc/files/grpc-1.62.1-system-gtest.patch |  88 +++++++++
 net-libs/grpc/grpc-1.62.1.ebuild                   | 210 +++++++++++++++++++++
 3 files changed, 299 insertions(+)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 7f8917ce7461..000c1f925495 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -3,3 +3,4 @@ DIST grpc-1.55.1.tar.gz 9272441 BLAKE2B b2788d8deeb9791f04073294caa82c10e2cfe637
 DIST grpc-1.56.1.tar.gz 11750628 BLAKE2B 52ea088d3d19fa7c1d1dc44899cd67bfd0132df2fd37690d855194d3196e4c26cfdd6fe589b5e4f802cdf88e70aad6c33b3ee98c1bd1bc47356d0dee9cdc706d SHA512 2bf9619edb60a6cec4cdaa89ee3c470c52b9745ea954bfe205aef6eb29bb55949de02e8c2afc7352eacdcd33fe4000861fd16fda9e5f66c87222674b17d6322a
 DIST grpc-1.57.0.tar.gz 17337863 BLAKE2B 10c6fb35f606806aeb25cd55dd993d9af168eb8b1db64b4515830e2144dc44f35ce8f8329316a38d933b8032a0eff386591a0ddb87f2e405c5deaba012db2824 SHA512 b323de7c1f35b9de3fb7bf02ff4db6993abb0eee6860bbf2082818dda405fbe3a19fad91c5b48565cb65c6318de739bb91e47b5095801c078c6cbf3e8c73600c
 DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 35cc0ea938deb848ca91e3d5f8879b85b80f94ac09b582600f05fee1f55c162ae98f2f744480f69d78e78da0c0f2d9e198f812101daaa1f1959869f26ba7d97a SHA512 91c2406ed4198509ac0d5360b3da6898fa4f40f459eb6fff541faa44cc238eed98fd7489e7ef7a80a6f4a318bc5b9130eaa0ba1beaa358d1c074fc82825648ff
+DIST grpc-1.62.1.tar.gz 22384671 BLAKE2B 134e40732e784e52d518cde6e518e4c08e2f67a025754d88b92a9a314f86e53bee33ee793395b9e225c0895c6ac8b9c036892c82c19d0fddf69909a22eac4b78 SHA512 3224ad2617c18156f90c54c1ebf1f2015e405a6f12546e8709e0c905f52508c9f1a13b4d5a6cc7a35abf58b429985b5b504c9062f50c0d3d6aa163180a61047a

diff --git a/net-libs/grpc/files/grpc-1.62.1-system-gtest.patch b/net-libs/grpc/files/grpc-1.62.1-system-gtest.patch
new file mode 100644
index 000000000000..b8e7973a4de5
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.62.1-system-gtest.patch
@@ -0,0 +1,88 @@
+https://bugs.gentoo.org/927403
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a55616fb6..ee62502267 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3442,81 +3442,6 @@ if(gRPC_INSTALL)
+   )
+ endif()
+ 
+-if(gRPC_BUILD_TESTS)
+-
+-
+-add_library(gtest
+-  third_party/googletest/googlemock/src/gmock-cardinalities.cc
+-  third_party/googletest/googlemock/src/gmock-internal-utils.cc
+-  third_party/googletest/googlemock/src/gmock-matchers.cc
+-  third_party/googletest/googlemock/src/gmock-spec-builders.cc
+-  third_party/googletest/googlemock/src/gmock.cc
+-  third_party/googletest/googletest/src/gtest-assertion-result.cc
+-  third_party/googletest/googletest/src/gtest-death-test.cc
+-  third_party/googletest/googletest/src/gtest-filepath.cc
+-  third_party/googletest/googletest/src/gtest-matchers.cc
+-  third_party/googletest/googletest/src/gtest-port.cc
+-  third_party/googletest/googletest/src/gtest-printers.cc
+-  third_party/googletest/googletest/src/gtest-test-part.cc
+-  third_party/googletest/googletest/src/gtest-typed-test.cc
+-  third_party/googletest/googletest/src/gtest.cc
+-)
+-
+-target_compile_features(gtest PUBLIC cxx_std_14)
+-
+-set_target_properties(gtest PROPERTIES
+-  VERSION ${gRPC_CORE_VERSION}
+-  SOVERSION ${gRPC_CORE_SOVERSION}
+-)
+-
+-if(WIN32 AND MSVC)
+-  set_target_properties(gtest PROPERTIES COMPILE_PDB_NAME "gtest"
+-    COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+-  )
+-  if(gRPC_INSTALL)
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gtest.pdb
+-      DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL
+-    )
+-  endif()
+-endif()
+-
+-target_include_directories(gtest
+-  PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+-  PRIVATE
+-    ${CMAKE_CURRENT_SOURCE_DIR}
+-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+-    ${_gRPC_RE2_INCLUDE_DIR}
+-    ${_gRPC_SSL_INCLUDE_DIR}
+-    ${_gRPC_UPB_GENERATED_DIR}
+-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+-    ${_gRPC_UPB_INCLUDE_DIR}
+-    ${_gRPC_XXHASH_INCLUDE_DIR}
+-    ${_gRPC_ZLIB_INCLUDE_DIR}
+-    third_party/googletest/googletest/include
+-    third_party/googletest/googletest
+-    third_party/googletest/googlemock/include
+-    third_party/googletest/googlemock
+-)
+-target_link_libraries(gtest
+-  ${_gRPC_ALLTARGETS_LIBRARIES}
+-  ${_gRPC_RE2_LIBRARIES}
+-  absl::flat_hash_set
+-  absl::failure_signal_handler
+-  absl::stacktrace
+-  absl::symbolize
+-  absl::flags
+-  absl::flags_parse
+-  absl::flags_reflection
+-  absl::flags_usage
+-  absl::strings
+-  absl::any
+-  absl::optional
+-  absl::variant
+-)
+-
+-
+-endif()
+-
+ 
+ add_library(upb_base_lib
+   third_party/upb/upb/base/status.c

diff --git a/net-libs/grpc/grpc-1.62.1.ebuild b/net-libs/grpc/grpc-1.62.1.ebuild
new file mode 100644
index 000000000000..02cf7abac591
--- /dev/null
+++ b/net-libs/grpc/grpc-1.62.1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python3_{10,12} )
+inherit cmake flag-o-matic python-any-r1
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+LICENSE="Apache-2.0"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
+SLOT="0/39.162"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc examples test systemd"
+RESTRICT="!test? ( test )"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	=dev-cpp/abseil-cpp-20230802.0*:=
+	>=dev-libs/re2-0.2021.11.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+	>=dev-libs/protobuf-23.3:=
+	dev-libs/xxhash
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+		dev-cpp/gtest
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		net-misc/curl
+		$(python_gen_any_dep '
+			dev-python/twisted[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/cffi[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.62.1-system-gtest.patch" )
+
+python_check_deps() {
+	python_has_version -b "dev-python/twisted[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/cffi[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+soversion_check() {
+	local core_sover cpp_sover
+	# extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION    "1.37")'
+	core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	# remove dots, e.g. 1.37 -> 137
+	core_sover="${core_sover//./}"
+	cpp_sover="${cpp_sover//./}"
+	[[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
+	[[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
+}
+
+src_prepare() {
+	# These extra libs are defined as dependencies of the vendored gtest,
+	# which is a dependency of the unit tests, therefore they are normally
+	# implicitly picked up and linked to the test binaries.  However removing
+	# the vendored gtest to use the system one also removes these dependencies,
+	# so we have to redeclare them as dependencies of the test binaries individually.
+	local extra_libs=("gtest"
+					"gmock"
+					"\${_gRPC_RE2_LIBRARIES}"
+					"absl::flat_hash_set"
+					"absl::failure_signal_handler"
+					"absl::stacktrace"
+					"absl::symbolize"
+					"absl::flags"
+					"absl::flags_parse"
+					"absl::flags_reflection"
+					"absl::flags_usage"
+					"absl::strings"
+					"absl::any"
+					"absl::optional"
+					"absl::variant")
+	: "$(echo "${extra_libs[@]}" | "${EPYTHON}" -c 'import sys;print("\\n\\1".join(sys.stdin.read().split()))')"
+	local rstring="${_}"
+	sed -i -E "s/( +)gtest/\1${rstring}/g" "CMakeLists.txt" || die
+
+	# Integrate tests with ctest rather than the custom test framework.
+	# Formatted with dev-python/black.
+	"${EPYTHON}" - <<-EOF | tee -a "CMakeLists.txt"
+		import json, pathlib
+
+		print("if(gRPC_BUILD_TESTS)")
+		print("  ENABLE_TESTING()")
+		for line in [
+		  json.dumps([t["name"], "./" + t["name"], *t["args"]]).translate(
+		  str.maketrans(dict.fromkeys("[],", None))
+		  )
+		  for t in json.loads(
+		    pathlib.Path("tools/run_tests/generated/tests.json").read_text()
+		  )
+		  if "linux" in t["platforms"] and not t["flaky"] and not t.get("boringssl", False)
+		]:
+		  print(f"  add_test({line})")
+		print("endif()")
+	EOF
+
+	# Weird path issue.  All tests except these two assume they are running from top-level src
+	sed -i -E "s/lslash != nullptr/false/" "test/core/http/httpcli_test_util.cc" || die
+
+	# Called via system() by some of the C++ sources, respect EPYTHON
+	sed -i -E "s#for p in #for p in \"${EPYTHON}\"#" "tools/distrib/python_wrapper.sh" || die
+
+	# Respect EPYTHON when testing, don't touch installed files otherwise
+	use test && python_fix_shebang --force "${S}"
+
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+	# suppress network access, package builds fine without the submodules
+	mkdir "${S}/third_party/opencensus-proto/src" || die
+
+	soversion_check
+}
+
+src_configure() {
+	# https://github.com/grpc/grpc/issues/29652
+	filter-lto
+
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		-DCMAKE_CXX_STANDARD=17
+		-DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex !systemd)
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# This is normally done with start_port_server.py, but this forks and exits,
+	# while we need to capture the pid, so run it ourselves
+	"${EPYTHON}" "tools/run_tests/python_utils/port_server.py" \
+		-p 32766 -l "${T}/port_server.log" &
+	local port_server_pid="${!}"
+
+	# Reimplementation of what start_port_server.py does with curl
+	curl --retry 9999 --retry-all-errors --retry-max-time 120 \
+		--fail --silent --output /dev/null "http://localhost:32766/get" || die
+
+	local disabled_tests=(
+		no_logging_test # hangs everywhere, no output
+		grpc_tool_test # fails everywhere
+		examine_stack_test # fails on amd64 only
+		stack_tracer_test # fails on amd64 only
+		endpoint_pair_test # fails on alpha
+		event_poller_posix_test # fails on alpha
+		tcp_posix_test # fails on alpha
+	)
+
+	cmake_src_test -E "($(IFS=$"|"; echo "${disabled_tests[*]}"))"
+
+	kill "${port_server_pid}" || die
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2024-07-30  7:36 Joonas Niilola
  0 siblings, 0 replies; 15+ messages in thread
From: Joonas Niilola @ 2024-07-30  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     84d5bb0c3d44c52ad0ad966799fe1c2b2eeb252a
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Jul 18 19:56:00 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 07:36:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d5bb0c

net-libs/grpc: add 1.65.1, drop 1.65.0

1.65.0 was yanked, move to 1.65.1

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37608
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-libs/grpc/Manifest                             |   2 +-
 net-libs/grpc/files/grpc-1.65.0-system-gtest.patch |  14 +-
 .../{grpc-1.65.0.ebuild => grpc-1.65.1.ebuild}     | 164 +++++++++++++++++----
 3 files changed, 146 insertions(+), 34 deletions(-)

diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 9f1f912d579f..15bd602fc31c 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -4,4 +4,4 @@ DIST grpc-1.56.1.tar.gz 11750628 BLAKE2B 52ea088d3d19fa7c1d1dc44899cd67bfd0132df
 DIST grpc-1.57.0.tar.gz 17337863 BLAKE2B 10c6fb35f606806aeb25cd55dd993d9af168eb8b1db64b4515830e2144dc44f35ce8f8329316a38d933b8032a0eff386591a0ddb87f2e405c5deaba012db2824 SHA512 b323de7c1f35b9de3fb7bf02ff4db6993abb0eee6860bbf2082818dda405fbe3a19fad91c5b48565cb65c6318de739bb91e47b5095801c078c6cbf3e8c73600c
 DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 35cc0ea938deb848ca91e3d5f8879b85b80f94ac09b582600f05fee1f55c162ae98f2f744480f69d78e78da0c0f2d9e198f812101daaa1f1959869f26ba7d97a SHA512 91c2406ed4198509ac0d5360b3da6898fa4f40f459eb6fff541faa44cc238eed98fd7489e7ef7a80a6f4a318bc5b9130eaa0ba1beaa358d1c074fc82825648ff
 DIST grpc-1.62.1.tar.gz 22384671 BLAKE2B 134e40732e784e52d518cde6e518e4c08e2f67a025754d88b92a9a314f86e53bee33ee793395b9e225c0895c6ac8b9c036892c82c19d0fddf69909a22eac4b78 SHA512 3224ad2617c18156f90c54c1ebf1f2015e405a6f12546e8709e0c905f52508c9f1a13b4d5a6cc7a35abf58b429985b5b504c9062f50c0d3d6aa163180a61047a
-DIST grpc-1.65.0.tar.gz 22537894 BLAKE2B 08b53b515b6e80c19aae6b9d3af969f79cc0f25413bc60106276030cd45df677bc67a94327da1439a2c469d49ed71043cf852f38e7fa5a36c2cb875a71bd3aa5 SHA512 18fbce2f77caca6bd21374db2234411ec37d27e5b171b1008aac6810f1a98e3f51826b9dc5e8bd29a746e4f2f31b2a87d6f1bbf988e72e321ca81e7b14f1a4b5
+DIST grpc-1.65.1.tar.gz 22539865 BLAKE2B f044305a1817c46d12b96d65a7d70e4342921d372bbeb127840ccbf5cda1f5a34daf7319cd8564a7d327f6abfbac67e4300f80cfe9e66dd49d65d77d30fd3402 SHA512 ca8ebe71fb88a0fc605706c3c81c349e79c40b347081a06795fa64550720bc745373ac5d167263d098e98553077cfda141e4f4be2eefa5f345ede9b0ddec4f54

diff --git a/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch b/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
index 47be90892893..878ce10f8ffd 100644
--- a/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
+++ b/net-libs/grpc/files/grpc-1.65.0-system-gtest.patch
@@ -1,14 +1,11 @@
-https://bugs.gentoo.org/927403
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a55616fb6..ee62502267 100644
+index d4d798f..824c4ed 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3442,79 +3442,6 @@ if(gRPC_INSTALL)
-   )
+@@ -3504,77 +3504,8 @@ if(gRPC_INSTALL)
  endif()
  
--if(gRPC_BUILD_TESTS)
+ if(gRPC_BUILD_TESTS)
 -
 -add_library(gtest
 -  third_party/googletest/googlemock/src/gmock-cardinalities.cc
@@ -80,7 +77,8 @@ index 7a55616fb6..ee62502267 100644
 -)
 -
 -
--endif()
++  find_package(GTest REQUIRED)
++  enable_testing()
+ endif()
  
  add_library(upb_base_lib
-   third_party/upb/upb/base/status.c

diff --git a/net-libs/grpc/grpc-1.65.0.ebuild b/net-libs/grpc/grpc-1.65.1.ebuild
similarity index 57%
rename from net-libs/grpc/grpc-1.65.0.ebuild
rename to net-libs/grpc/grpc-1.65.1.ebuild
index b5a31691fd7d..448a008c7796 100644
--- a/net-libs/grpc/grpc-1.65.0.ebuild
+++ b/net-libs/grpc/grpc-1.65.1.ebuild
@@ -54,7 +54,9 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.65.0-system-gtest.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.65.0-system-gtest.patch"
+)
 
 python_check_deps() {
 	if use test; then
@@ -83,21 +85,23 @@ src_prepare() {
 	# implicitly picked up and linked to the test binaries.  However removing
 	# the vendored gtest to use the system one also removes these dependencies,
 	# so we have to redeclare them as dependencies of the test binaries individually.
-	local extra_libs=("gtest"
-					"gmock"
-					"\${_gRPC_RE2_LIBRARIES}"
-					"absl::flat_hash_set"
-					"absl::failure_signal_handler"
-					"absl::stacktrace"
-					"absl::symbolize"
-					"absl::flags"
-					"absl::flags_parse"
-					"absl::flags_reflection"
-					"absl::flags_usage"
-					"absl::strings"
-					"absl::any"
-					"absl::optional"
-					"absl::variant")
+	local extra_libs=(
+		"GTest::gtest"
+		"GTest::gmock"
+		"\${_gRPC_RE2_LIBRARIES}"
+		"absl::flat_hash_set"
+		"absl::failure_signal_handler"
+		"absl::stacktrace"
+		"absl::symbolize"
+		"absl::flags"
+		"absl::flags_parse"
+		"absl::flags_reflection"
+		"absl::flags_usage"
+		"absl::strings"
+		"absl::any"
+		"absl::optional"
+		"absl::variant"
+	)
 	: "$(echo "${extra_libs[@]}" | "${EPYTHON}" -c 'import sys;print("\\n\\1".join(sys.stdin.read().split()))')"
 	local rstring="${_}"
 	sed -i -E "s/( +)gtest/\1${rstring}/g" "CMakeLists.txt" || die
@@ -108,7 +112,6 @@ src_prepare() {
 		import json, pathlib
 
 		print("if(gRPC_BUILD_TESTS)")
-		print("  ENABLE_TESTING()")
 		for line in [
 		  json.dumps([t["name"], "./" + t["name"], *t["args"]]).translate(
 		  str.maketrans(dict.fromkeys("[],", None))
@@ -147,6 +150,7 @@ src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
+		-DgRPC_DOWNLOAD_ARCHIVES=OFF
 		-DgRPC_INSTALL=ON
 		-DgRPC_ABSL_PROVIDER=package
 		-DgRPC_CARES_PROVIDER=package
@@ -157,8 +161,8 @@ src_configure() {
 		-DgRPC_SSL_PROVIDER=package
 		-DgRPC_ZLIB_PROVIDER=package
 		-DgRPC_BUILD_TESTS=$(usex test)
+		-DgRPC_USE_SYSTEMD=$(usex systemd ON OFF)
 		-DCMAKE_CXX_STANDARD=17
-		-DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex !systemd)
 		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
 	)
 	cmake_src_configure
@@ -176,13 +180,123 @@ src_test() {
 		--fail --silent --output /dev/null "http://localhost:32766/get" || die
 
 	CMAKE_SKIP_TESTS=(
-		no_logging_test # hangs everywhere, no output
-		grpc_tool_test # fails everywhere
-		examine_stack_test # fails on amd64 only
-		stack_tracer_test # fails on amd64 only
-		endpoint_pair_test # fails on alpha
-		event_poller_posix_test # fails on alpha
-		tcp_posix_test # fails on alpha
+		# CallCommandWithTimeoutDeadlineSet has a timeout set to 5000.25 seconds
+		^grpc_tool_test$
+
+		# Need network access
+		^posix_event_engine_native_dns_test$
+		^posix_event_engine_test$
+		^resolve_address_using_ares_resolver_test$
+		^resolve_address_using_native_resolver_test$
+	)
+
+	use amd64 && CMAKE_SKIP_TESTS+=(
+		^examine_stack_test$ # fails on amd64 only
+		^stack_tracer_test$ # fails on amd64 only
+	)
+
+	use alpha && CMAKE_SKIP_TESTS+=(
+		^endpoint_pair_test$ # fails on alpha
+		^event_poller_posix_test$ # fails on alpha
+		^tcp_posix_test$ # fails on alpha
+	)
+
+	# NOTE breaks with shared linking because the metric is twice initialised in a static function in a anonymous namespace
+	# metrics.cc:49] Metric name grpc.lb.pick_first.disconnections has already been registered.
+	# https://bugs.gentoo.org/935787 Leave the bug open until we fixed the underlying issue
+	CMAKE_SKIP_TESTS+=(
+		^bad_ping_test$
+		^binary_metadata_test$
+		^call_creds_test$
+		^call_host_override_test$
+		^cancel_after_accept_test$
+		^cancel_after_client_done_test$
+		^cancel_after_invoke_test$
+		^cancel_after_round_trip_test$
+		^cancel_before_invoke_test$
+		^cancel_in_a_vacuum_test$
+		^cancel_with_status_test$
+		^client_streaming_test$
+		^compressed_payload_test$
+		^connectivity_test$
+		^default_host_test$
+		^disappearing_server_test$
+		^empty_batch_test$
+		^filter_causes_close_test$
+		^filter_init_fails_test$
+		^filter_test_test$
+		^filtered_metadata_test$
+		^graceful_server_shutdown_test$
+		^grpc_authz_test$
+		^high_initial_seqno_test$
+		^hpack_size_test$
+		^http2_stats_test$
+		^invoke_large_request_test$
+		^keepalive_timeout_test$
+		^large_metadata_test$
+		^max_concurrent_streams_test$
+		^max_connection_age_test$
+		^max_connection_idle_test$
+		^max_message_length_test$
+		^negative_deadline_test$
+		^no_logging_test$
+		^no_op_test$
+		^payload_test$
+		^ping_pong_streaming_test$
+		^ping_test$
+		^proxy_auth_test$
+		^registered_call_test$
+		^request_with_flags_test$
+		^request_with_payload_test$
+		^resource_quota_server_test$
+		^retry_cancel_after_first_attempt_starts_test$
+		^retry_cancel_during_delay_test$
+		^retry_cancel_with_multiple_send_batches_test$
+		^retry_cancellation_test$
+		^retry_disabled_test$
+		^retry_exceeds_buffer_size_in_delay_test$
+		^retry_exceeds_buffer_size_in_initial_batch_test$
+		^retry_exceeds_buffer_size_in_subsequent_batch_test$
+		^retry_lb_drop_test$
+		^retry_lb_fail_test$
+		^retry_non_retriable_status_before_trailers_test$
+		^retry_non_retriable_status_test$
+		^retry_per_attempt_recv_timeout_on_last_attempt_test$
+		^retry_per_attempt_recv_timeout_test$
+		^retry_recv_initial_metadata_test$
+		^retry_recv_message_replay_test$
+		^retry_recv_message_test$
+		^retry_recv_trailing_metadata_error_test$
+		^retry_send_initial_metadata_refs_test$
+		^retry_send_op_fails_test$
+		^retry_send_recv_batch_test$
+		^retry_server_pushback_delay_test$
+		^retry_server_pushback_disabled_test$
+		^retry_streaming_after_commit_test$
+		^retry_streaming_succeeds_before_replay_finished_test$
+		^retry_streaming_test$
+		^retry_test$
+		^retry_throttled_test$
+		^retry_too_many_attempts_test$
+		^retry_transparent_goaway_test$
+		^retry_transparent_max_concurrent_streams_test$
+		^retry_transparent_not_sent_on_wire_test$
+		^retry_unref_before_finish_test$
+		^retry_unref_before_recv_test$
+		^server_finishes_request_test$
+		^server_streaming_test$
+		^shutdown_finishes_calls_test$
+		^shutdown_finishes_tags_test$
+		^simple_delayed_request_test$
+		^simple_metadata_test$
+		^simple_request_test$
+		^streaming_error_response_test$
+		^test_core_end2end_channelz_test$
+		^thread_pool_test$
+		^timeout_before_request_call_test$
+		^trailing_metadata_test$
+		^write_buffering_at_end_test$
+		^write_buffering_test$
 	)
 
 	# BUG this should be nonfatal and we kill the server even when tests fail


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/
@ 2024-09-04  8:39 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-09-04  8:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8ca9fa4e05dea29e5e3f2685b54b09d600a8c2b2
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Wed Sep  4 08:32:42 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 08:39:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca9fa4e

net-libs/grpc: fix build against abseil-cpp-20240722.0

Closes: https://bugs.gentoo.org/939015
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/38422
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/grpc/files/grpc-1.65.0-vlog.patch | 17 +++++++++++++++++
 net-libs/grpc/grpc-1.65.1.ebuild           |  1 +
 2 files changed, 18 insertions(+)

diff --git a/net-libs/grpc/files/grpc-1.65.0-vlog.patch b/net-libs/grpc/files/grpc-1.65.0-vlog.patch
new file mode 100644
index 000000000000..e57c0ba222b3
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.65.0-vlog.patch
@@ -0,0 +1,17 @@
+
+Fix build with abseil-cpp-20240722.0 which no longer implicitly
+includes absl/log/vlog_is_on.h
+
+See: https://github.com/abseil/abseil-cpp/releases/tag/20240722.0
+Bug: https://bugs.gentoo.org/939015
+
+--- grpc-1.65.1/src/core/util/log.cc~	2024-07-17 00:53:49.000000000 +0200
++++ grpc-1.65.1/src/core/util/log.cc	2024-09-04 09:28:18.494476262 +0200
+@@ -19,6 +19,7 @@
+ #include <grpc/support/port_platform.h>
+ 
+ #include "absl/log/log.h"
++#include "absl/log/vlog_is_on.h"
+ 
+ #include <stdio.h>
+ #include <string.h>

diff --git a/net-libs/grpc/grpc-1.65.1.ebuild b/net-libs/grpc/grpc-1.65.1.ebuild
index 448a008c7796..3fbe1dcd6309 100644
--- a/net-libs/grpc/grpc-1.65.1.ebuild
+++ b/net-libs/grpc/grpc-1.65.1.ebuild
@@ -56,6 +56,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.65.0-system-gtest.patch"
+	"${FILESDIR}/${PN}-1.65.0-vlog.patch"
 )
 
 python_check_deps() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2024-09-04  8:39 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-12 18:57 [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/files/, net-libs/grpc/ Georgy Yakovlev
  -- strict thread matches above, loose matches on Subject: below --
2024-09-04  8:39 Sam James
2024-07-30  7:36 Joonas Niilola
2024-07-01 19:01 Arthur Zamarin
2023-08-21 19:57 Sam James
2021-10-08 18:19 Arthur Zamarin
2020-09-25 23:33 Georgy Yakovlev
2020-09-25 22:55 Georgy Yakovlev
2019-11-16  0:31 Georgy Yakovlev
2019-07-27  9:07 Georgy Yakovlev
2019-07-14  1:10 Georgy Yakovlev
2019-05-28  4:53 Georgy Yakovlev
2018-06-30  8:06 Georgy Yakovlev
2018-06-12  6:53 Jason Zaman
2018-06-12  6:53 Jason Zaman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox