Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/grpc/, net-libs/grpc/files/
Date: Sun, 28 Oct 2018 19:34:28
Message-Id: 1540755219.f39ed9cf181d96f0cc120a898379c06b103bc83b.gyakovlev@gentoo
1 commit: f39ed9cf181d96f0cc120a898379c06b103bc83b
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 28 19:33:39 2018 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 28 19:33:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39ed9cf
7
8 net-libs/grpc: fix ARG_MAX install error
9
10 Closes: https://bugs.gentoo.org/669730
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 ...0-Prevent-shell-calls-longer-than-ARG_MAX.patch | 70 ++++++++++++++++++++++
15 net-libs/grpc/grpc-1.16.0.ebuild | 1 +
16 2 files changed, 71 insertions(+)
17
18 diff --git a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
19 new file mode 100644
20 index 00000000000..fd9f9141954
21 --- /dev/null
22 +++ b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
23 @@ -0,0 +1,70 @@
24 +From 0892788776d60d92a0cddcd22078779166b736db Mon Sep 17 00:00:00 2001
25 +From: Dario Berzano <dario.berzano@××××.ch>
26 +Date: Thu, 5 Jul 2018 11:27:20 +0200
27 +Subject: [PATCH] Prevent shell calls longer than ARG_MAX
28 +
29 +This patch we breaks the relevant paths array into multiple shorter arrays in
30 +order to make the shell calls succeed.
31 +
32 +See grpc/grpc#14844.
33 +---
34 + Makefile | 16 ++++++++++++++++
35 + 1 file changed, 16 insertions(+)
36 +
37 +diff --git a/Makefile b/Makefile
38 +index 54823a31167..25eb092d996 100644
39 +--- a/Makefile
40 ++++ b/Makefile
41 +@@ -2946,8 +2946,14 @@ install-headers_c:
42 +
43 + install-headers_cxx:
44 + $(E) "[INSTALL] Installing public C++ headers"
45 +- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
46 +- $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
47 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
48 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
49 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
50 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
51 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
52 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
53 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
54 ++ $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
55 +
56 + install-static: install-static_c install-static_cxx
57 +
58 +@@ -5278,6 +5284,8 @@ PUBLIC_HEADERS_CXX += \
59 + include/grpc++/support/stub_options.h \
60 + include/grpc++/support/sync_stream.h \
61 + include/grpc++/support/time.h \
62 ++
63 ++PUBLIC_HEADERS_CXX1 += \
64 + include/grpcpp/alarm.h \
65 + include/grpcpp/channel.h \
66 + include/grpcpp/client_context.h \
67 +@@ -5325,6 +5333,8 @@ PUBLIC_HEADERS_CXX += \
68 + include/grpcpp/support/stub_options.h \
69 + include/grpcpp/support/sync_stream.h \
70 + include/grpcpp/support/time.h \
71 ++
72 ++PUBLIC_HEADERS_CXX2 += \
73 + include/grpc/support/alloc.h \
74 + include/grpc/support/atm.h \
75 + include/grpc/support/atm_gcc_atomic.h \
76 +@@ -5376,6 +5386,8 @@ PUBLIC_HEADERS_CXX += \
77 + include/grpc/impl/codegen/propagation_bits.h \
78 + include/grpc/impl/codegen/slice.h \
79 + include/grpc/impl/codegen/status.h \
80 ++
81 ++PUBLIC_HEADERS_CXX3 += \
82 + include/grpc++/impl/codegen/async_stream.h \
83 + include/grpc++/impl/codegen/async_unary_call.h \
84 + include/grpc++/impl/codegen/byte_buffer.h \
85 +@@ -5406,6 +5418,8 @@ PUBLIC_HEADERS_CXX += \
86 + include/grpc++/impl/codegen/stub_options.h \
87 + include/grpc++/impl/codegen/sync_stream.h \
88 + include/grpc++/impl/codegen/time.h \
89 ++
90 ++PUBLIC_HEADERS_CXX4 += \
91 + include/grpcpp/impl/codegen/async_generic_service.h \
92 + include/grpcpp/impl/codegen/async_stream.h \
93 + include/grpcpp/impl/codegen/async_unary_call.h \
94
95 diff --git a/net-libs/grpc/grpc-1.16.0.ebuild b/net-libs/grpc/grpc-1.16.0.ebuild
96 index 31caf4ced50..b3fac81f326 100644
97 --- a/net-libs/grpc/grpc-1.16.0.ebuild
98 +++ b/net-libs/grpc/grpc-1.16.0.ebuild
99 @@ -35,6 +35,7 @@ PATCHES=(
100 "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
101 "${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
102 "${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
103 + "${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
104 )
105
106 S="${WORKDIR}/${PN}-${MY_PV}"