Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/
Date: Mon, 31 May 2021 23:04:12
Message-Id: 1622502099.929e2ffe3708f6c6d2f409fa50b6a222874d4319.floppym@gentoo
1 commit: 929e2ffe3708f6c6d2f409fa50b6a222874d4319
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Wed May 26 00:00:00 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon May 31 23:01:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929e2ffe
7
8 dev-libs/protobuf: Disable tests failing on 32-bit architectures.
9
10 Closes: https://bugs.gentoo.org/788436
11 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 dev-libs/protobuf/protobuf-3.15.0.ebuild | 9 +++++++++
15 dev-libs/protobuf/protobuf-3.15.1.ebuild | 9 +++++++++
16 dev-libs/protobuf/protobuf-3.15.2.ebuild | 9 +++++++++
17 dev-libs/protobuf/protobuf-3.15.3.ebuild | 9 +++++++++
18 dev-libs/protobuf/protobuf-3.15.4.ebuild | 9 +++++++++
19 dev-libs/protobuf/protobuf-3.15.5.ebuild | 9 +++++++++
20 dev-libs/protobuf/protobuf-3.15.6.ebuild | 9 +++++++++
21 dev-libs/protobuf/protobuf-3.15.7.ebuild | 9 +++++++++
22 dev-libs/protobuf/protobuf-3.15.8.ebuild | 9 +++++++++
23 9 files changed, 81 insertions(+)
24
25 diff --git a/dev-libs/protobuf/protobuf-3.15.0.ebuild b/dev-libs/protobuf/protobuf-3.15.0.ebuild
26 index 9cadeaf4923..d1feac0db81 100644
27 --- a/dev-libs/protobuf/protobuf-3.15.0.ebuild
28 +++ b/dev-libs/protobuf/protobuf-3.15.0.ebuild
29 @@ -49,6 +49,15 @@ src_prepare() {
30 # https://github.com/protocolbuffers/protobuf/issues/8082
31 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
32
33 + # https://github.com/protocolbuffers/protobuf/issues/8459
34 + sed \
35 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
36 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
37 + -i src/google/protobuf/arena_unittest.cc || die
38 +
39 + # https://github.com/protocolbuffers/protobuf/issues/8460
40 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
41 +
42 eautoreconf
43 }
44
45
46 diff --git a/dev-libs/protobuf/protobuf-3.15.1.ebuild b/dev-libs/protobuf/protobuf-3.15.1.ebuild
47 index 9cadeaf4923..d1feac0db81 100644
48 --- a/dev-libs/protobuf/protobuf-3.15.1.ebuild
49 +++ b/dev-libs/protobuf/protobuf-3.15.1.ebuild
50 @@ -49,6 +49,15 @@ src_prepare() {
51 # https://github.com/protocolbuffers/protobuf/issues/8082
52 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
53
54 + # https://github.com/protocolbuffers/protobuf/issues/8459
55 + sed \
56 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
57 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
58 + -i src/google/protobuf/arena_unittest.cc || die
59 +
60 + # https://github.com/protocolbuffers/protobuf/issues/8460
61 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
62 +
63 eautoreconf
64 }
65
66
67 diff --git a/dev-libs/protobuf/protobuf-3.15.2.ebuild b/dev-libs/protobuf/protobuf-3.15.2.ebuild
68 index 9cadeaf4923..d1feac0db81 100644
69 --- a/dev-libs/protobuf/protobuf-3.15.2.ebuild
70 +++ b/dev-libs/protobuf/protobuf-3.15.2.ebuild
71 @@ -49,6 +49,15 @@ src_prepare() {
72 # https://github.com/protocolbuffers/protobuf/issues/8082
73 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
74
75 + # https://github.com/protocolbuffers/protobuf/issues/8459
76 + sed \
77 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
78 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
79 + -i src/google/protobuf/arena_unittest.cc || die
80 +
81 + # https://github.com/protocolbuffers/protobuf/issues/8460
82 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
83 +
84 eautoreconf
85 }
86
87
88 diff --git a/dev-libs/protobuf/protobuf-3.15.3.ebuild b/dev-libs/protobuf/protobuf-3.15.3.ebuild
89 index 9cadeaf4923..d1feac0db81 100644
90 --- a/dev-libs/protobuf/protobuf-3.15.3.ebuild
91 +++ b/dev-libs/protobuf/protobuf-3.15.3.ebuild
92 @@ -49,6 +49,15 @@ src_prepare() {
93 # https://github.com/protocolbuffers/protobuf/issues/8082
94 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
95
96 + # https://github.com/protocolbuffers/protobuf/issues/8459
97 + sed \
98 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
99 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
100 + -i src/google/protobuf/arena_unittest.cc || die
101 +
102 + # https://github.com/protocolbuffers/protobuf/issues/8460
103 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
104 +
105 eautoreconf
106 }
107
108
109 diff --git a/dev-libs/protobuf/protobuf-3.15.4.ebuild b/dev-libs/protobuf/protobuf-3.15.4.ebuild
110 index 9cadeaf4923..d1feac0db81 100644
111 --- a/dev-libs/protobuf/protobuf-3.15.4.ebuild
112 +++ b/dev-libs/protobuf/protobuf-3.15.4.ebuild
113 @@ -49,6 +49,15 @@ src_prepare() {
114 # https://github.com/protocolbuffers/protobuf/issues/8082
115 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
116
117 + # https://github.com/protocolbuffers/protobuf/issues/8459
118 + sed \
119 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
120 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
121 + -i src/google/protobuf/arena_unittest.cc || die
122 +
123 + # https://github.com/protocolbuffers/protobuf/issues/8460
124 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
125 +
126 eautoreconf
127 }
128
129
130 diff --git a/dev-libs/protobuf/protobuf-3.15.5.ebuild b/dev-libs/protobuf/protobuf-3.15.5.ebuild
131 index 9cadeaf4923..d1feac0db81 100644
132 --- a/dev-libs/protobuf/protobuf-3.15.5.ebuild
133 +++ b/dev-libs/protobuf/protobuf-3.15.5.ebuild
134 @@ -49,6 +49,15 @@ src_prepare() {
135 # https://github.com/protocolbuffers/protobuf/issues/8082
136 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
137
138 + # https://github.com/protocolbuffers/protobuf/issues/8459
139 + sed \
140 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
141 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
142 + -i src/google/protobuf/arena_unittest.cc || die
143 +
144 + # https://github.com/protocolbuffers/protobuf/issues/8460
145 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
146 +
147 eautoreconf
148 }
149
150
151 diff --git a/dev-libs/protobuf/protobuf-3.15.6.ebuild b/dev-libs/protobuf/protobuf-3.15.6.ebuild
152 index 9cadeaf4923..d1feac0db81 100644
153 --- a/dev-libs/protobuf/protobuf-3.15.6.ebuild
154 +++ b/dev-libs/protobuf/protobuf-3.15.6.ebuild
155 @@ -49,6 +49,15 @@ src_prepare() {
156 # https://github.com/protocolbuffers/protobuf/issues/8082
157 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
158
159 + # https://github.com/protocolbuffers/protobuf/issues/8459
160 + sed \
161 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
162 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
163 + -i src/google/protobuf/arena_unittest.cc || die
164 +
165 + # https://github.com/protocolbuffers/protobuf/issues/8460
166 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
167 +
168 eautoreconf
169 }
170
171
172 diff --git a/dev-libs/protobuf/protobuf-3.15.7.ebuild b/dev-libs/protobuf/protobuf-3.15.7.ebuild
173 index 9cadeaf4923..d1feac0db81 100644
174 --- a/dev-libs/protobuf/protobuf-3.15.7.ebuild
175 +++ b/dev-libs/protobuf/protobuf-3.15.7.ebuild
176 @@ -49,6 +49,15 @@ src_prepare() {
177 # https://github.com/protocolbuffers/protobuf/issues/8082
178 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
179
180 + # https://github.com/protocolbuffers/protobuf/issues/8459
181 + sed \
182 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
183 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
184 + -i src/google/protobuf/arena_unittest.cc || die
185 +
186 + # https://github.com/protocolbuffers/protobuf/issues/8460
187 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
188 +
189 eautoreconf
190 }
191
192
193 diff --git a/dev-libs/protobuf/protobuf-3.15.8.ebuild b/dev-libs/protobuf/protobuf-3.15.8.ebuild
194 index 7fff0e4d377..06466128520 100644
195 --- a/dev-libs/protobuf/protobuf-3.15.8.ebuild
196 +++ b/dev-libs/protobuf/protobuf-3.15.8.ebuild
197 @@ -49,6 +49,15 @@ src_prepare() {
198 # https://github.com/protocolbuffers/protobuf/issues/8082
199 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
200
201 + # https://github.com/protocolbuffers/protobuf/issues/8459
202 + sed \
203 + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
204 + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
205 + -i src/google/protobuf/arena_unittest.cc || die
206 +
207 + # https://github.com/protocolbuffers/protobuf/issues/8460
208 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
209 +
210 eautoreconf
211 }