1 |
commit: ef1803fa74e037b72cff1976ac97cbd74f2ef26e |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Wed Dec 16 00:00:00 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 18:39:06 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1803fa |
7 |
|
8 |
dev-libs/protobuf: Delete old version (3.11.4). |
9 |
|
10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
dev-libs/protobuf/Manifest | 1 - |
14 |
.../protobuf-3.11.0-disable_no-warning-test.patch | 19 -- |
15 |
...protobuf-3.11.0-protoc_input_output_files.patch | 262 --------------------- |
16 |
.../files/protobuf-3.11.0-system_libraries.patch | 121 ---------- |
17 |
dev-libs/protobuf/protobuf-3.11.4.ebuild | 128 ---------- |
18 |
5 files changed, 531 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest |
21 |
index 517abfc7f26..f999d53e988 100644 |
22 |
--- a/dev-libs/protobuf/Manifest |
23 |
+++ b/dev-libs/protobuf/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
-DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261 |
26 |
DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b |
27 |
DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c |
28 |
DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd |
29 |
|
30 |
diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch |
31 |
deleted file mode 100644 |
32 |
index ec043e3865c..00000000000 |
33 |
--- a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch |
34 |
+++ /dev/null |
35 |
@@ -1,19 +0,0 @@ |
36 |
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings. |
37 |
- |
38 |
---- /src/Makefile.am |
39 |
-+++ /src/Makefile.am |
40 |
-@@ -714,7 +714,7 @@ |
41 |
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock |
42 |
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ |
43 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
44 |
-- no-warning-test $(GZCHECKPROGRAMS) |
45 |
-+ $(GZCHECKPROGRAMS) |
46 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
47 |
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
48 |
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
49 |
-@@ -901,4 +901,4 @@ |
50 |
- |
51 |
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ |
52 |
- google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ |
53 |
-- protobuf-lite-arena-test no-warning-test |
54 |
-+ protobuf-lite-arena-test |
55 |
|
56 |
diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch |
57 |
deleted file mode 100644 |
58 |
index 0e22b34efc3..00000000000 |
59 |
--- a/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch |
60 |
+++ /dev/null |
61 |
@@ -1,262 +0,0 @@ |
62 |
-https://github.com/protocolbuffers/protobuf/pull/235 |
63 |
- |
64 |
---- /src/google/protobuf/compiler/command_line_interface.cc |
65 |
-+++ /src/google/protobuf/compiler/command_line_interface.cc |
66 |
-@@ -938,6 +938,28 @@ |
67 |
- } |
68 |
- |
69 |
- if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { |
70 |
-+ bool success = false; |
71 |
-+ int in_fd = STDIN_FILENO; |
72 |
-+ int out_fd = STDOUT_FILENO; |
73 |
-+ |
74 |
-+ if (!protobuf_in_path_.empty()) { |
75 |
-+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); |
76 |
-+ if (in_fd == -1) { |
77 |
-+ std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl; |
78 |
-+ return 1; |
79 |
-+ } |
80 |
-+ } |
81 |
-+ if (!protobuf_out_path_.empty()) { |
82 |
-+ out_fd = open(protobuf_out_path_.c_str(), |
83 |
-+ O_WRONLY | O_CREAT | O_TRUNC, |
84 |
-+ 0644); |
85 |
-+ if (out_fd == -1) { |
86 |
-+ std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl; |
87 |
-+ close(in_fd); |
88 |
-+ return 1; |
89 |
-+ } |
90 |
-+ } |
91 |
-+ |
92 |
- if (codec_type_.empty()) { |
93 |
- // HACK: Define an EmptyMessage type to use for decoding. |
94 |
- DescriptorPool pool; |
95 |
-@@ -946,13 +968,20 @@ |
96 |
- file.add_message_type()->set_name("EmptyMessage"); |
97 |
- GOOGLE_CHECK(pool.BuildFile(file) != NULL); |
98 |
- codec_type_ = "EmptyMessage"; |
99 |
-- if (!EncodeOrDecode(&pool)) { |
100 |
-- return 1; |
101 |
-- } |
102 |
-+ success = EncodeOrDecode(&pool, in_fd, out_fd); |
103 |
- } else { |
104 |
-- if (!EncodeOrDecode(descriptor_pool.get())) { |
105 |
-- return 1; |
106 |
-- } |
107 |
-+ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd); |
108 |
-+ } |
109 |
-+ |
110 |
-+ if (in_fd != STDIN_FILENO) { |
111 |
-+ close(in_fd); |
112 |
-+ } |
113 |
-+ if (out_fd != STDOUT_FILENO) { |
114 |
-+ close(out_fd); |
115 |
-+ } |
116 |
-+ |
117 |
-+ if (!success) { |
118 |
-+ return 1; |
119 |
- } |
120 |
- } |
121 |
- |
122 |
-@@ -990,6 +1019,11 @@ |
123 |
- for (int i = 0; i < proto_path_.size(); i++) { |
124 |
- source_tree->MapPath(proto_path_[i].first, proto_path_[i].second); |
125 |
- } |
126 |
-+ if (mode_ == MODE_COMPILE && |
127 |
-+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { |
128 |
-+ std::cerr << "--protobuf_in and --protobuf_out are only valid with " |
129 |
-+ << "decode operations. Ignoring."; |
130 |
-+ } |
131 |
- |
132 |
- // Map input files to virtual paths if possible. |
133 |
- if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) { |
134 |
-@@ -1650,6 +1684,12 @@ |
135 |
- |
136 |
- codec_type_ = value; |
137 |
- |
138 |
-+ } else if (name == "--protobuf_in") { |
139 |
-+ protobuf_in_path_ = value; |
140 |
-+ |
141 |
-+ } else if (name == "--protobuf_out") { |
142 |
-+ protobuf_out_path_ = value; |
143 |
-+ |
144 |
- } else if (name == "--error_format") { |
145 |
- if (value == "gcc") { |
146 |
- error_format_ = ERROR_FORMAT_GCC; |
147 |
-@@ -1786,29 +1826,50 @@ |
148 |
- " -h, --help Show this text and exit.\n" |
149 |
- " --encode=MESSAGE_TYPE Read a text-format message of the " |
150 |
- "given type\n" |
151 |
-- " from standard input and write it in " |
152 |
-- "binary\n" |
153 |
-- " to standard output. The message type " |
154 |
-- "must\n" |
155 |
-+ " and write it in binary. The message " |
156 |
-+ "type must\n" |
157 |
- " be defined in PROTO_FILES or their " |
158 |
- "imports.\n" |
159 |
-+ " The input/output protobuf files are " |
160 |
-+ "specified\n" |
161 |
-+ " using the --protobuf_in and " |
162 |
-+ "--protobuf_out\n" |
163 |
-+ " command line flags.\n" |
164 |
- " --decode=MESSAGE_TYPE Read a binary message of the given " |
165 |
-- "type from\n" |
166 |
-- " standard input and write it in text " |
167 |
-- "format\n" |
168 |
-- " to standard output. The message type " |
169 |
-- "must\n" |
170 |
-- " be defined in PROTO_FILES or their " |
171 |
-- "imports.\n" |
172 |
-+ "type and\n" |
173 |
-+ " write it in text format. The message " |
174 |
-+ "type\n" |
175 |
-+ " must be defined in PROTO_FILES or " |
176 |
-+ "their imports.\n" |
177 |
-+ " The input/output protobuf files are " |
178 |
-+ "specified\n" |
179 |
-+ " using the --protobuf_in and " |
180 |
-+ "--protobuf_out\n" |
181 |
-+ " command line flags.\n" |
182 |
- " --decode_raw Read an arbitrary protocol message " |
183 |
-- "from\n" |
184 |
-- " standard input and write the raw " |
185 |
-- "tag/value\n" |
186 |
-- " pairs in text format to standard " |
187 |
-- "output. No\n" |
188 |
-+ "and write\n" |
189 |
-+ " the raw tag/value pairs in text format." |
190 |
-+ " No\n" |
191 |
- " PROTO_FILES should be given when using " |
192 |
- "this\n" |
193 |
-- " flag.\n" |
194 |
-+ " flag. The input/output protobuf files " |
195 |
-+ "are\n" |
196 |
-+ " specified using the --protobuf_in and\n" |
197 |
-+ " --protobuf_out command line flags.\n" |
198 |
-+ " --protobuf_in=FILE Absolute path to the protobuf file " |
199 |
-+ "from which\n" |
200 |
-+ " input of encoding/decoding operation " |
201 |
-+ "will be\n" |
202 |
-+ " read. If omitted, input will be read " |
203 |
-+ "from\n" |
204 |
-+ " standard input.\n" |
205 |
-+ " --protobuf_out=FILE Absolute path to the protobuf file " |
206 |
-+ "to which\n" |
207 |
-+ " output of encoding/decoding operation " |
208 |
-+ "will be\n" |
209 |
-+ " written. If omitted, output will be " |
210 |
-+ "written to\n" |
211 |
-+ " standard output.\n" |
212 |
- " --descriptor_set_in=FILES Specifies a delimited list of FILES\n" |
213 |
- " each containing a FileDescriptorSet " |
214 |
- "(a\n" |
215 |
-@@ -2123,7 +2184,9 @@ |
216 |
- return true; |
217 |
- } |
218 |
- |
219 |
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { |
220 |
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, |
221 |
-+ int in_fd, |
222 |
-+ int out_fd) { |
223 |
- // Look up the type. |
224 |
- const Descriptor* type = pool->FindMessageTypeByName(codec_type_); |
225 |
- if (type == NULL) { |
226 |
-@@ -2135,15 +2198,15 @@ |
227 |
- std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New()); |
228 |
- |
229 |
- if (mode_ == MODE_ENCODE) { |
230 |
-- SetFdToTextMode(STDIN_FILENO); |
231 |
-- SetFdToBinaryMode(STDOUT_FILENO); |
232 |
-+ SetFdToTextMode(in_fd); |
233 |
-+ SetFdToBinaryMode(out_fd); |
234 |
- } else { |
235 |
-- SetFdToBinaryMode(STDIN_FILENO); |
236 |
-- SetFdToTextMode(STDOUT_FILENO); |
237 |
-+ SetFdToBinaryMode(in_fd); |
238 |
-+ SetFdToTextMode(out_fd); |
239 |
- } |
240 |
- |
241 |
-- io::FileInputStream in(STDIN_FILENO); |
242 |
-- io::FileOutputStream out(STDOUT_FILENO); |
243 |
-+ io::FileInputStream in(in_fd); |
244 |
-+ io::FileOutputStream out(out_fd); |
245 |
- |
246 |
- if (mode_ == MODE_ENCODE) { |
247 |
- // Input is text. |
248 |
---- /src/google/protobuf/compiler/command_line_interface.h |
249 |
-+++ /src/google/protobuf/compiler/command_line_interface.h |
250 |
-@@ -288,7 +288,9 @@ |
251 |
- GeneratorContext* generator_context, std::string* error); |
252 |
- |
253 |
- // Implements --encode and --decode. |
254 |
-- bool EncodeOrDecode(const DescriptorPool* pool); |
255 |
-+ bool EncodeOrDecode(const DescriptorPool* pool, |
256 |
-+ int in_fd, |
257 |
-+ int out_fd); |
258 |
- |
259 |
- // Implements the --descriptor_set_out option. |
260 |
- bool WriteDescriptorSet( |
261 |
-@@ -420,6 +422,13 @@ |
262 |
- // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty. |
263 |
- std::vector<std::string> descriptor_set_in_names_; |
264 |
- |
265 |
-+ // When using --encode / --decode / --decode_raw absolute path to the output |
266 |
-+ // file. (Empty string indicates write to STDOUT). |
267 |
-+ std::string protobuf_out_path_; |
268 |
-+ // When using --encode / --decode / --decode_raw, absolute path to the input |
269 |
-+ // file. (Empty string indicates read from STDIN). |
270 |
-+ std::string protobuf_in_path_; |
271 |
-+ |
272 |
- // If --descriptor_set_out was given, this is the filename to which the |
273 |
- // FileDescriptorSet should be written. Otherwise, empty. |
274 |
- std::string descriptor_set_out_name_; |
275 |
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc |
276 |
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc |
277 |
-@@ -95,7 +95,7 @@ |
278 |
- virtual void SetUp(); |
279 |
- virtual void TearDown(); |
280 |
- |
281 |
-- // Runs the CommandLineInterface with the given command line. The |
282 |
-+ // Run the CommandLineInterface with the given command line. The |
283 |
- // command is automatically split on spaces, and the string "$tmpdir" |
284 |
- // is replaced with TestTempDir(). |
285 |
- void Run(const std::string& command); |
286 |
-@@ -2491,6 +2491,17 @@ |
287 |
- std::string::npos); |
288 |
- } |
289 |
- |
290 |
-+ void ExpectBinaryFilesMatch(const string &expected_file, |
291 |
-+ const string &actual_file) { |
292 |
-+ string expected_output, actual_output; |
293 |
-+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); |
294 |
-+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); |
295 |
-+ |
296 |
-+ // Don't use EXPECT_EQ because we don't want to print raw binary data to |
297 |
-+ // stdout on failure. |
298 |
-+ EXPECT_TRUE(expected_output == actual_output); |
299 |
-+ } |
300 |
-+ |
301 |
- private: |
302 |
- void WriteUnittestProtoDescriptorSet() { |
303 |
- unittest_proto_descriptor_set_filename_ = |
304 |
-@@ -2585,6 +2596,19 @@ |
305 |
- "net/proto2/internal/no_such_file.proto: No such file or directory\n"); |
306 |
- } |
307 |
- |
308 |
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) { |
309 |
-+ string out_file = TestTempDir() + "/golden_message_out.pbf"; |
310 |
-+ EXPECT_TRUE( |
311 |
-+ Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") + |
312 |
-+ " --encode=protobuf_unittest.TestAllTypes" + |
313 |
-+ " --protobuf_in=" + TestUtil::GetTestDataPath( |
314 |
-+ "net/proto2/internal/" |
315 |
-+ "testdata/text_format_unittest_data_oneof_implemented.txt") + |
316 |
-+ " --protobuf_out=" + out_file)); |
317 |
-+ ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath( |
318 |
-+ "net/proto2/internal/testdata/golden_message_oneof_implemented")); |
319 |
-+} |
320 |
-+ |
321 |
- INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest, |
322 |
- testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN)); |
323 |
- } // anonymous namespace |
324 |
|
325 |
diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch |
326 |
deleted file mode 100644 |
327 |
index 8311ce8b22e..00000000000 |
328 |
--- a/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch |
329 |
+++ /dev/null |
330 |
@@ -1,121 +0,0 @@ |
331 |
---- /Makefile.am |
332 |
-+++ /Makefile.am |
333 |
-@@ -11,28 +11,10 @@ |
334 |
- # Always include third_party directories in distributions. |
335 |
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest |
336 |
- |
337 |
--# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS |
338 |
--# because then "make check" would also build and run all of gmock's own tests, |
339 |
--# which takes a lot of time and is generally not useful to us. Also, we don't |
340 |
--# want "make install" to recurse into gmock since we don't want to overwrite |
341 |
--# the installed version of gmock if there is one. |
342 |
- check-local: |
343 |
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
344 |
-- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la |
345 |
-- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la |
346 |
- |
347 |
--# We would like to clean gmock when "make clean" is invoked. But we have to |
348 |
--# be careful because clean-local is also invoked during "make distclean", but |
349 |
--# "make distclean" already recurses into gmock because it's listed among the |
350 |
--# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to |
351 |
--# cd to the directory again and "make clean" it will fail. So, check that the |
352 |
--# Makefile exists before recursing. |
353 |
- clean-local: |
354 |
-- @if test -e third_party/googletest/Makefile; then \ |
355 |
-- echo "Making clean in googletest"; \ |
356 |
-- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
357 |
-- fi; \ |
358 |
-- if test -e conformance/Makefile; then \ |
359 |
-+ @if test -e conformance/Makefile; then \ |
360 |
- echo "Making clean in conformance"; \ |
361 |
- cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
362 |
- fi; \ |
363 |
---- /configure.ac |
364 |
-+++ /configure.ac |
365 |
-@@ -223,12 +223,5 @@ |
366 |
- esac |
367 |
- AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) |
368 |
- |
369 |
--# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, |
370 |
--# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |
371 |
--# too. |
372 |
--export CFLAGS |
373 |
--export CXXFLAGS |
374 |
--AC_CONFIG_SUBDIRS([third_party/googletest]) |
375 |
-- |
376 |
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) |
377 |
- AC_OUTPUT |
378 |
---- /src/Makefile.am |
379 |
-+++ /src/Makefile.am |
380 |
-@@ -708,19 +708,11 @@ |
381 |
- google/protobuf/testing/file.cc \ |
382 |
- google/protobuf/testing/file.h |
383 |
- |
384 |
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest |
385 |
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock |
386 |
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest |
387 |
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock |
388 |
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ |
389 |
- protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
390 |
- $(GZCHECKPROGRAMS) |
391 |
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
392 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
393 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
394 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
395 |
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ |
396 |
-- -I$(GOOGLEMOCK_SRC_DIR)/include |
397 |
-+ -lgtest -lgmock -lgmock_main |
398 |
- # Disable optimization for tests unless the user explicitly asked for it, |
399 |
- # since test_util.cc takes forever to compile with optimization (with GCC). |
400 |
- # See configure.ac for more info. |
401 |
-@@ -812,12 +804,8 @@ |
402 |
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. |
403 |
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ |
404 |
- libprotoc.la \ |
405 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
406 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
407 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
408 |
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ |
409 |
-- -I$(GOOGLETEST_SRC_DIR)/include \ |
410 |
-- -DPROTOBUF_TEST_NO_DESCRIPTORS |
411 |
-+ -lgtest -lgmock -lgmock_main |
412 |
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS |
413 |
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
414 |
- protobuf_lazy_descriptor_test_SOURCES = \ |
415 |
- google/protobuf/compiler/cpp/cpp_unittest.cc \ |
416 |
-@@ -838,11 +826,7 @@ |
417 |
- # full runtime and we want to make sure this test builds without full |
418 |
- # runtime. |
419 |
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
420 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
421 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
422 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
423 |
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ |
424 |
-- -I$(GOOGLETEST_SRC_DIR)/include |
425 |
-+ -lgtest -lgmock -lgmock_main |
426 |
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
427 |
- protobuf_lite_test_SOURCES = \ |
428 |
- google/protobuf/lite_unittest.cc \ |
429 |
-@@ -854,11 +838,7 @@ |
430 |
- # gtest when building the test internally our memory sanitizer doesn't detect |
431 |
- # memory leaks (don't know why). |
432 |
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ |
433 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ |
434 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ |
435 |
-- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la |
436 |
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ |
437 |
-- -I$(GOOGLETEST_SRC_DIR)/include |
438 |
-+ -lgtest -lgmock -lgmock_main |
439 |
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
440 |
- protobuf_lite_arena_test_SOURCES = \ |
441 |
- google/protobuf/lite_arena_unittest.cc \ |
442 |
-@@ -868,8 +848,7 @@ |
443 |
- |
444 |
- # Test plugin binary. |
445 |
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
446 |
-- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la |
447 |
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include |
448 |
-+ -lgtest |
449 |
- test_plugin_SOURCES = \ |
450 |
- google/protobuf/compiler/mock_code_generator.cc \ |
451 |
- google/protobuf/testing/file.cc \ |
452 |
|
453 |
diff --git a/dev-libs/protobuf/protobuf-3.11.4.ebuild b/dev-libs/protobuf/protobuf-3.11.4.ebuild |
454 |
deleted file mode 100644 |
455 |
index 568a3f45c37..00000000000 |
456 |
--- a/dev-libs/protobuf/protobuf-3.11.4.ebuild |
457 |
+++ /dev/null |
458 |
@@ -1,128 +0,0 @@ |
459 |
-# Copyright 2008-2020 Gentoo Authors |
460 |
-# Distributed under the terms of the GNU General Public License v2 |
461 |
- |
462 |
-EAPI="7" |
463 |
- |
464 |
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs |
465 |
- |
466 |
-if [[ "${PV}" == "9999" ]]; then |
467 |
- inherit git-r3 |
468 |
- |
469 |
- EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" |
470 |
- EGIT_SUBMODULES=() |
471 |
-fi |
472 |
- |
473 |
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" |
474 |
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" |
475 |
-if [[ "${PV}" == "9999" ]]; then |
476 |
- SRC_URI="" |
477 |
-else |
478 |
- SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
479 |
-fi |
480 |
- |
481 |
-LICENSE="BSD" |
482 |
-SLOT="0/22" |
483 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
484 |
-IUSE="emacs examples static-libs test zlib" |
485 |
-RESTRICT="!test? ( test )" |
486 |
- |
487 |
-BDEPEND="emacs? ( app-editors/emacs:* )" |
488 |
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) |
489 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
490 |
-RDEPEND="emacs? ( app-editors/emacs:* ) |
491 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
492 |
- |
493 |
-PATCHES=( |
494 |
- "${FILESDIR}/${PN}-3.11.0-disable_no-warning-test.patch" |
495 |
- "${FILESDIR}/${PN}-3.11.0-system_libraries.patch" |
496 |
- "${FILESDIR}/${PN}-3.11.0-protoc_input_output_files.patch" |
497 |
-) |
498 |
- |
499 |
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) |
500 |
- |
501 |
-src_prepare() { |
502 |
- default |
503 |
- |
504 |
- # https://github.com/protocolbuffers/protobuf/issues/7413 |
505 |
- sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die |
506 |
- |
507 |
- eautoreconf |
508 |
-} |
509 |
- |
510 |
-src_configure() { |
511 |
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI |
512 |
- |
513 |
- if tc-ld-is-gold; then |
514 |
- # https://sourceware.org/bugzilla/show_bug.cgi?id=24527 |
515 |
- tc-ld-disable-gold |
516 |
- fi |
517 |
- |
518 |
- multilib-minimal_src_configure |
519 |
-} |
520 |
- |
521 |
-multilib_src_configure() { |
522 |
- local options=( |
523 |
- $(use_enable static-libs static) |
524 |
- $(use_with zlib) |
525 |
- ) |
526 |
- |
527 |
- if tc-is-cross-compiler; then |
528 |
- # Build system uses protoc when building, so protoc copy runnable on host is needed. |
529 |
- mkdir -p "${WORKDIR}/build" || die |
530 |
- pushd "${WORKDIR}/build" > /dev/null || die |
531 |
- ECONF_SOURCE="${S}" econf_build "${options[@]}" |
532 |
- options+=(--with-protoc="$(pwd)/src/protoc") |
533 |
- popd > /dev/null || die |
534 |
- fi |
535 |
- |
536 |
- ECONF_SOURCE="${S}" econf "${options[@]}" |
537 |
-} |
538 |
- |
539 |
-src_compile() { |
540 |
- multilib-minimal_src_compile |
541 |
- |
542 |
- if use emacs; then |
543 |
- elisp-compile editors/protobuf-mode.el |
544 |
- fi |
545 |
-} |
546 |
- |
547 |
-multilib_src_compile() { |
548 |
- if tc-is-cross-compiler; then |
549 |
- emake -C "${WORKDIR}/build/src" protoc |
550 |
- fi |
551 |
- |
552 |
- default |
553 |
-} |
554 |
- |
555 |
-multilib_src_test() { |
556 |
- emake check |
557 |
-} |
558 |
- |
559 |
-multilib_src_install_all() { |
560 |
- find "${D}" -name "*.la" -type f -delete || die |
561 |
- |
562 |
- insinto /usr/share/vim/vimfiles/syntax |
563 |
- doins editors/proto.vim |
564 |
- insinto /usr/share/vim/vimfiles/ftdetect |
565 |
- doins "${FILESDIR}/proto.vim" |
566 |
- |
567 |
- if use emacs; then |
568 |
- elisp-install ${PN} editors/protobuf-mode.el* |
569 |
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" |
570 |
- fi |
571 |
- |
572 |
- if use examples; then |
573 |
- DOCS+=(examples) |
574 |
- docompress -x /usr/share/doc/${PF}/examples |
575 |
- fi |
576 |
- |
577 |
- einstalldocs |
578 |
-} |
579 |
- |
580 |
-pkg_postinst() { |
581 |
- use emacs && elisp-site-regen |
582 |
-} |
583 |
- |
584 |
-pkg_postrm() { |
585 |
- use emacs && elisp-site-regen |
586 |
-} |