From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- .../protobuf-3.6.0-disable_no-warning-test.patch | 19 -- .../protobuf-3.6.0-protoc_input_output_files.patch | 233 --------------------- .../files/protobuf-3.6.0-system_libraries.patch | 121 ----------- .../files/protobuf-3.6.1-libatomic_linking.patch | 49 ----- 4 files changed, 422 deletions(-) delete mode 100644 dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch delete mode 100644 dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch delete mode 100644 dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch delete mode 100644 dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch (limited to 'dev-libs/protobuf/files') diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch deleted file mode 100644 index 834f6b0d1ab5..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings. - ---- /src/Makefile.am -+++ /src/Makefile.am -@@ -717,7 +717,7 @@ - GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock - check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ -- no-warning-test $(GZCHECKPROGRAMS) -+ $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ - $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ - $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -@@ -900,4 +900,4 @@ - - TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ - google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ -- protobuf-lite-arena-test no-warning-test -+ protobuf-lite-arena-test diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch deleted file mode 100644 index 8b583522f464..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch +++ /dev/null @@ -1,233 +0,0 @@ -https://github.com/protocolbuffers/protobuf/pull/235 - ---- /src/google/protobuf/compiler/command_line_interface.cc -+++ /src/google/protobuf/compiler/command_line_interface.cc -@@ -931,6 +931,28 @@ - } - - if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { -+ bool success = false; -+ int in_fd = STDIN_FILENO; -+ int out_fd = STDOUT_FILENO; -+ -+ if (!protobuf_in_path_.empty()) { -+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); -+ if (in_fd == -1) { -+ std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl; -+ return 1; -+ } -+ } -+ if (!protobuf_out_path_.empty()) { -+ out_fd = open(protobuf_out_path_.c_str(), -+ O_WRONLY | O_CREAT | O_TRUNC, -+ 0644); -+ if (out_fd == -1) { -+ std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl; -+ close(in_fd); -+ return 1; -+ } -+ } -+ - if (codec_type_.empty()) { - // HACK: Define an EmptyMessage type to use for decoding. - DescriptorPool pool; -@@ -939,13 +961,20 @@ - file.add_message_type()->set_name("EmptyMessage"); - GOOGLE_CHECK(pool.BuildFile(file) != NULL); - codec_type_ = "EmptyMessage"; -- if (!EncodeOrDecode(&pool)) { -- return 1; -- } -+ success = EncodeOrDecode(&pool, in_fd, out_fd); - } else { -- if (!EncodeOrDecode(descriptor_pool.get())) { -- return 1; -- } -+ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd); -+ } -+ -+ if (in_fd != STDIN_FILENO) { -+ close(in_fd); -+ } -+ if (out_fd != STDOUT_FILENO) { -+ close(out_fd); -+ } -+ -+ if (!success) { -+ return 1; - } - } - -@@ -983,6 +1012,11 @@ - for (int i = 0; i < proto_path_.size(); i++) { - source_tree->MapPath(proto_path_[i].first, proto_path_[i].second); - } -+ if (mode_ == MODE_COMPILE && -+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { -+ std::cerr << "--protobuf_in and --protobuf_out are only valid with " -+ << "decode operations. Ignoring."; -+ } - - // Map input files to virtual paths if possible. - if (!MakeInputsBeProtoPathRelative(source_tree)) { -@@ -1571,6 +1605,12 @@ - - codec_type_ = value; - -+ } else if (name == "--protobuf_in") { -+ protobuf_in_path_ = value; -+ -+ } else if (name == "--protobuf_out") { -+ protobuf_out_path_ = value; -+ - } else if (name == "--error_format") { - if (value == "gcc") { - error_format_ = ERROR_FORMAT_GCC; -@@ -1693,18 +1733,29 @@ - " --version Show version info and exit.\n" - " -h, --help Show this text and exit.\n" - " --encode=MESSAGE_TYPE Read a text-format message of the given type\n" --" from standard input and write it in binary\n" --" to standard output. The message type must\n" --" be defined in PROTO_FILES or their imports.\n" --" --decode=MESSAGE_TYPE Read a binary message of the given type from\n" --" standard input and write it in text format\n" --" to standard output. The message type must\n" -+" an write it in binary. The message type must\n" - " be defined in PROTO_FILES or their imports.\n" --" --decode_raw Read an arbitrary protocol message from\n" --" standard input and write the raw tag/value\n" --" pairs in text format to standard output. No\n" -+" The input/output protobuf files are specified\n" -+" using the --protobuf_in and --protobuf_out\n" -+" command line flags.\n" -+" --decode=MESSAGE_TYPE Read a binary message of the given type and\n" -+" write it in text format. The message type\n" -+" must be defined in PROTO_FILES or their\n" -+" imports. The input/output protobuf files are\n" -+" specified using the --protobuf_in and \n" -+" --protobuf_out command line flags.\n" -+" --decode_raw Read an arbitrary protocol message and write\n" -+" the raw tag/value pairs in text format. No\n" - " PROTO_FILES should be given when using this\n" --" flag.\n" -+" flag. The input/output protobuf files are\n" -+" specified using the --protobuf_in and \n" -+" --protobuf_out command line flags.\n" -+" --protobuf_in Absolute path to the protobuf file to read to\n" -+" encode/decode. If omitted, file will be read\n" -+" from STDIN.\n" -+" --protobuf_out Absolute path to the protobuf file to write to\n" -+" after encode/decode operation. If omitted,\n" -+" output is written to STDOUT.\n" - " --descriptor_set_in=FILES Specifies a delimited list of FILES\n" - " each containing a FileDescriptorSet (a\n" - " protocol buffer defined in descriptor.proto).\n" -@@ -1983,7 +2034,9 @@ - return true; - } - --bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { -+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd) { - // Look up the type. - const Descriptor* type = pool->FindMessageTypeByName(codec_type_); - if (type == NULL) { -@@ -1995,15 +2048,15 @@ - std::unique_ptr message(dynamic_factory.GetPrototype(type)->New()); - - if (mode_ == MODE_ENCODE) { -- SetFdToTextMode(STDIN_FILENO); -- SetFdToBinaryMode(STDOUT_FILENO); -+ SetFdToTextMode(in_fd); -+ SetFdToBinaryMode(out_fd); - } else { -- SetFdToBinaryMode(STDIN_FILENO); -- SetFdToTextMode(STDOUT_FILENO); -+ SetFdToBinaryMode(in_fd); -+ SetFdToTextMode(out_fd); - } - -- io::FileInputStream in(STDIN_FILENO); -- io::FileOutputStream out(STDOUT_FILENO); -+ io::FileInputStream in(in_fd); -+ io::FileOutputStream out(out_fd); - - if (mode_ == MODE_ENCODE) { - // Input is text. ---- /src/google/protobuf/compiler/command_line_interface.h -+++ /src/google/protobuf/compiler/command_line_interface.h -@@ -272,7 +272,9 @@ - GeneratorContext* generator_context, string* error); - - // Implements --encode and --decode. -- bool EncodeOrDecode(const DescriptorPool* pool); -+ bool EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd); - - // Implements the --descriptor_set_out option. - bool WriteDescriptorSet( -@@ -405,6 +407,13 @@ - // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty. - std::vector descriptor_set_in_names_; - -+ // When using --encode / --decode / --decode_raw absolute path to the output -+ // file. (Empty string indicates write to STDOUT). -+ string protobuf_out_path_; -+ // When using --encode / --decode / --decode_raw, absolute path to the input -+ // file. (Empty string indicates read from STDIN). -+ string protobuf_in_path_; -+ - // If --descriptor_set_out was given, this is the filename to which the - // FileDescriptorSet should be written. Otherwise, empty. - string descriptor_set_out_name_; ---- /src/google/protobuf/compiler/command_line_interface_unittest.cc -+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc -@@ -94,7 +94,7 @@ - virtual void SetUp(); - virtual void TearDown(); - -- // Runs the CommandLineInterface with the given command line. The -+ // Run the CommandLineInterface with the given command line. The - // command is automatically split on spaces, and the string "$tmpdir" - // is replaced with TestTempDir(). - void Run(const string& command); -@@ -2337,6 +2337,17 @@ - EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); - } - -+ void ExpectBinaryFilesMatch(const string &expected_file, -+ const string &actual_file) { -+ string expected_output, actual_output; -+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); -+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); -+ -+ // Don't use EXPECT_EQ because we don't want to print raw binary data to -+ // stdout on failure. -+ EXPECT_TRUE(expected_output == actual_output); -+ } -+ - private: - void WriteUnittestProtoDescriptorSet() { - unittest_proto_descriptor_set_filename_ = -@@ -2427,6 +2438,18 @@ - "google/protobuf/no_such_file.proto: No such file or directory\n"); - } - -+TEST_P(EncodeDecodeTest, RedirectInputOutput) { -+ string out_file = TestTempDir() + "/golden_message_out.pbf"; -+ string cmd = ""; -+ cmd += "google/protobuf/unittest.proto "; -+ cmd += "--encode=protobuf_unittest.TestAllTypes "; -+ cmd += "--protobuf_in=" + TestSourceDir() + -+ "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt "; -+ cmd += "--protobuf_out=" + out_file; -+ EXPECT_TRUE(Run(cmd)); -+ ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented"); -+} -+ - INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource, - EncodeDecodeTest, - testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN)); diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch deleted file mode 100644 index b1408f050e00..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- /Makefile.am -+++ /Makefile.am -@@ -11,28 +11,10 @@ - # Always include third_party directories in distributions. - DIST_SUBDIRS = src conformance benchmarks third_party/googletest - --# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS --# because then "make check" would also build and run all of gmock's own tests, --# which takes a lot of time and is generally not useful to us. Also, we don't --# want "make install" to recurse into gmock since we don't want to overwrite --# the installed version of gmock if there is one. - check-local: -- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la - --# We would like to clean gmock when "make clean" is invoked. But we have to --# be careful because clean-local is also invoked during "make distclean", but --# "make distclean" already recurses into gmock because it's listed among the --# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to --# cd to the directory again and "make clean" it will fail. So, check that the --# Makefile exists before recursing. - clean-local: -- @if test -e third_party/googletest/Makefile; then \ -- echo "Making clean in googletest"; \ -- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \ -- fi; \ -- if test -e conformance/Makefile; then \ -+ @if test -e conformance/Makefile; then \ - echo "Making clean in conformance"; \ - cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ - fi; \ ---- /configure.ac -+++ /configure.ac -@@ -209,12 +209,5 @@ - - AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) - --# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, --# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock --# too. --export CFLAGS --export CXXFLAGS --AC_CONFIG_SUBDIRS([third_party/googletest]) -- - AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) - AC_OUTPUT ---- /src/Makefile.am -+++ /src/Makefile.am -@@ -711,19 +711,11 @@ - google/protobuf/testing/file.cc \ - google/protobuf/testing/file.h - --GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest --GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock --GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest --GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock - check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ -- -I$(GOOGLEMOCK_SRC_DIR)/include -+ -lgtest -lgmock -lgmock_main - # Disable optimization for tests unless the user explicitly asked for it, - # since test_util.cc takes forever to compile with optimization (with GCC). - # See configure.ac for more info. -@@ -811,12 +803,8 @@ - # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. - protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ -- -I$(GOOGLETEST_SRC_DIR)/include \ -- -DPROTOBUF_TEST_NO_DESCRIPTORS -+ -lgtest -lgmock -lgmock_main -+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS - protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lazy_descriptor_test_SOURCES = \ - google/protobuf/compiler/cpp/cpp_unittest.cc \ -@@ -837,11 +825,7 @@ - # full runtime and we want to make sure this test builds without full - # runtime. - protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la --protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ -- -I$(GOOGLETEST_SRC_DIR)/include -+ -lgtest -lgmock -lgmock_main - protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_test_SOURCES = \ - google/protobuf/lite_unittest.cc \ -@@ -853,11 +837,7 @@ - # gtest when building the test internally our memory sanitizer doesn't detect - # memory leaks (don't know why). - protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ -- -I$(GOOGLETEST_SRC_DIR)/include -+ -lgtest -lgmock -lgmock_main - protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ -@@ -867,8 +847,7 @@ - - # Test plugin binary. - test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include -+ -lgtest - test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ diff --git a/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch b/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch deleted file mode 100644 index 2b357b213170..000000000000 --- a/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://github.com/protocolbuffers/protobuf/issues/5219 -https://github.com/protocolbuffers/protobuf/pull/5227 -https://github.com/protocolbuffers/protobuf/commit/56b40a8f055cfd05633054aed5d3466a6e058b72 - ---- /configure.ac -+++ /configure.ac -@@ -165,6 +165,22 @@ - ]) - AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1]) - -+dnl On some platforms, std::atomic needs a helper library -+AC_MSG_CHECKING(whether -latomic is needed) -+AC_LINK_IFELSE([AC_LANG_SOURCE([[ -+ #include -+ #include -+ std::atomic v; -+ int main() { -+ return v; -+ } -+]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes) -+AC_MSG_RESULT($STD_ATOMIC_NEED_LIBATOMIC) -+if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then -+ LIBATOMIC_LIBS="-latomic" -+fi -+AC_SUBST([LIBATOMIC_LIBS]) -+ - AS_IF([test "$with_protoc" != "no"], [ - PROTOC=$with_protoc - AS_IF([test "$with_protoc" = "yes"], [ ---- /src/Makefile.am -+++ /src/Makefile.am -@@ -163,7 +163,7 @@ - - lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la - --libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) -+libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS) - libprotobuf_lite_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined - if HAVE_LD_VERSION_SCRIPT - libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map -@@ -209,7 +209,7 @@ - google/protobuf/io/zero_copy_stream.cc \ - google/protobuf/io/zero_copy_stream_impl_lite.cc - --libprotobuf_la_LIBADD = $(PTHREAD_LIBS) -+libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS) - libprotobuf_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined - if HAVE_LD_VERSION_SCRIPT - libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map -- cgit v1.2.3