mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
dev-libs/protobuf: Delete old versions (<3.6.1.3).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
committed by
Mike Gilbert
parent
f255bdc22e
commit
8c0dbd4ca5
@@ -1,7 +1 @@
|
||||
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
|
||||
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
|
||||
DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
|
||||
DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88
|
||||
DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c
|
||||
DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
|
||||
DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
|
||||
|
||||
@@ -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
|
||||
@@ -750,7 +750,7 @@
|
||||
|
||||
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 \
|
||||
../gmock/gtest/lib/libgtest.la \
|
||||
../gmock/lib/libgmock.la \
|
||||
@@ -931,4 +931,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
|
||||
@@ -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
|
||||
@@ -942,6 +942,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;
|
||||
@@ -950,13 +972,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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -994,6 +1023,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)) {
|
||||
@@ -1561,6 +1595,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;
|
||||
@@ -1684,18 +1724,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"
|
||||
@@ -1957,7 +2008,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) {
|
||||
@@ -1969,15 +2022,15 @@
|
||||
google::protobuf::scoped_ptr<Message> 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
|
||||
@@ -269,7 +269,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(
|
||||
@@ -402,6 +404,13 @@
|
||||
// parsed FileDescriptorSets to be used for loading protos. Otherwise, empty.
|
||||
std::vector<string> 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
|
||||
@@ -95,7 +95,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);
|
||||
@@ -2308,6 +2308,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_ =
|
||||
@@ -2398,6 +2409,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));
|
||||
@@ -1,117 +0,0 @@
|
||||
--- /Makefile.am
|
||||
+++ /Makefile.am
|
||||
@@ -8,31 +8,12 @@
|
||||
# the right time.
|
||||
SUBDIRS = . src
|
||||
|
||||
-# Always include gmock in distributions.
|
||||
-DIST_SUBDIRS = $(subdirs) src conformance benchmarks
|
||||
+DIST_SUBDIRS = src conformance benchmarks
|
||||
|
||||
-# 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 gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
|
||||
- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_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 gmock/Makefile; then \
|
||||
- echo "Making clean in gmock"; \
|
||||
- cd gmock && $(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
|
||||
@@ -200,12 +200,5 @@
|
||||
|
||||
AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
|
||||
|
||||
-# 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([gmock])
|
||||
-
|
||||
AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
|
||||
AC_OUTPUT
|
||||
--- /src/Makefile.am
|
||||
+++ /src/Makefile.am
|
||||
@@ -752,11 +752,7 @@
|
||||
protobuf-lite-test test_plugin protobuf-lite-arena-test \
|
||||
no-warning-test $(GZCHECKPROGRAMS)
|
||||
protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
|
||||
- ../gmock/gtest/lib/libgtest.la \
|
||||
- ../gmock/lib/libgmock.la \
|
||||
- ../gmock/lib/libgmock_main.la
|
||||
-protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \
|
||||
- -I$(srcdir)/../gmock/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.
|
||||
@@ -843,12 +839,8 @@
|
||||
# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
|
||||
protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
|
||||
libprotoc.la \
|
||||
- ../gmock/gtest/lib/libgtest.la \
|
||||
- ../gmock/lib/libgmock.la \
|
||||
- ../gmock/lib/libgmock_main.la
|
||||
-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \
|
||||
- -I$(srcdir)/../gmock/gtest/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 \
|
||||
@@ -868,11 +860,7 @@
|
||||
# full runtime and we want to make sure this test builds without full
|
||||
# runtime.
|
||||
protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
|
||||
- ../gmock/gtest/lib/libgtest.la \
|
||||
- ../gmock/lib/libgmock.la \
|
||||
- ../gmock/lib/libgmock_main.la
|
||||
-protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \
|
||||
- -I$(srcdir)/../gmock/gtest/include
|
||||
+ -lgtest -lgmock -lgmock_main
|
||||
protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
|
||||
protobuf_lite_test_SOURCES = \
|
||||
google/protobuf/lite_unittest.cc \
|
||||
@@ -883,11 +871,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 \
|
||||
- ../gmock/gtest/lib/libgtest.la \
|
||||
- ../gmock/lib/libgmock.la \
|
||||
- ../gmock/lib/libgmock_main.la
|
||||
-protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \
|
||||
- -I$(srcdir)/../gmock/gtest/include
|
||||
+ -lgtest -lgmock -lgmock_main
|
||||
protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
|
||||
protobuf_lite_arena_test_SOURCES = \
|
||||
google/protobuf/lite_arena_unittest.cc \
|
||||
@@ -896,8 +880,7 @@
|
||||
|
||||
# Test plugin binary.
|
||||
test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
|
||||
- ../gmock/gtest/lib/libgtest.la
|
||||
-test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
|
||||
+ -lgtest
|
||||
test_plugin_SOURCES = \
|
||||
google/protobuf/compiler/mock_code_generator.cc \
|
||||
google/protobuf/testing/file.cc \
|
||||
@@ -1,21 +0,0 @@
|
||||
https://github.com/protocolbuffers/protobuf/issues/3937
|
||||
https://github.com/protocolbuffers/protobuf/pull/3955
|
||||
https://github.com/protocolbuffers/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
|
||||
|
||||
--- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
|
||||
+++ /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
|
||||
@@ -146,6 +146,14 @@
|
||||
return __atomic_load_n(ptr, __ATOMIC_RELAXED);
|
||||
}
|
||||
|
||||
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
|
||||
+ Atomic64 old_value,
|
||||
+ Atomic64 new_value) {
|
||||
+ __atomic_compare_exchange_n(ptr, &old_value, new_value, false,
|
||||
+ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
|
||||
+ return old_value;
|
||||
+}
|
||||
+
|
||||
#endif // defined(__LP64__)
|
||||
|
||||
} // namespace internal
|
||||
@@ -1,106 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
|
||||
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
|
||||
SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/15"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="emacs examples static-libs test zlib"
|
||||
|
||||
RDEPEND="emacs? ( virtual/emacs )
|
||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
|
||||
"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
|
||||
"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
|
||||
"${FILESDIR}/${PN}-3.5.0-atomic_operations.patch"
|
||||
)
|
||||
|
||||
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_enable static-libs static)
|
||||
$(use_with zlib)
|
||||
)
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
# The build system wants `protoc` when building, so we need a copy that
|
||||
# runs on the host. This is more hermetic than relying on the version
|
||||
# installed in the host being the exact same version.
|
||||
mkdir -p "${WORKDIR}/build" || die
|
||||
pushd "${WORKDIR}/build" > /dev/null || die
|
||||
ECONF_SOURCE="${S}" econf_build "${myeconfargs[@]}"
|
||||
myeconfargs+=(--with-protoc="${PWD}"/src/protoc)
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
multilib-minimal_src_compile
|
||||
|
||||
if use emacs; then
|
||||
elisp-compile editors/protobuf-mode.el
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if tc-is-cross-compiler; then
|
||||
emake -C "${WORKDIR}/build/src" protoc
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins editors/proto.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/proto.vim"
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} editors/protobuf-mode.el*
|
||||
elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
DOCS+=(examples)
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
|
||||
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
|
||||
SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/15"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="emacs examples static-libs test zlib"
|
||||
|
||||
RDEPEND="emacs? ( virtual/emacs )
|
||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
|
||||
"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
|
||||
"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
|
||||
"${FILESDIR}/${PN}-3.5.0-atomic_operations.patch"
|
||||
)
|
||||
|
||||
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local options=(
|
||||
$(use_enable static-libs static)
|
||||
$(use_with zlib)
|
||||
)
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
# Build system uses protoc when building, so protoc copy runnable on host is needed.
|
||||
mkdir -p "${WORKDIR}/build" || die
|
||||
pushd "${WORKDIR}/build" > /dev/null || die
|
||||
ECONF_SOURCE="${S}" econf_build "${options[@]}"
|
||||
options+=(--with-protoc="$(pwd)/src/protoc")
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${options[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
multilib-minimal_src_compile
|
||||
|
||||
if use emacs; then
|
||||
elisp-compile editors/protobuf-mode.el
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if tc-is-cross-compiler; then
|
||||
emake -C "${WORKDIR}/build/src" protoc
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins editors/proto.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/proto.vim"
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} editors/protobuf-mode.el*
|
||||
elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
DOCS+=(examples)
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@@ -1,105 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
|
||||
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
|
||||
SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/16"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="emacs examples static-libs test zlib"
|
||||
|
||||
RDEPEND="emacs? ( virtual/emacs )
|
||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
|
||||
"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
|
||||
"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
|
||||
)
|
||||
|
||||
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local options=(
|
||||
$(use_enable static-libs static)
|
||||
$(use_with zlib)
|
||||
)
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
# Build system uses protoc when building, so protoc copy runnable on host is needed.
|
||||
mkdir -p "${WORKDIR}/build" || die
|
||||
pushd "${WORKDIR}/build" > /dev/null || die
|
||||
ECONF_SOURCE="${S}" econf_build "${options[@]}"
|
||||
options+=(--with-protoc="$(pwd)/src/protoc")
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${options[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
multilib-minimal_src_compile
|
||||
|
||||
if use emacs; then
|
||||
elisp-compile editors/protobuf-mode.el
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if tc-is-cross-compiler; then
|
||||
emake -C "${WORKDIR}/build/src" protoc
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${D}" -name "*.la" -delete || die
|
||||
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins editors/proto.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/proto.vim"
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} editors/protobuf-mode.el*
|
||||
elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
DOCS+=(examples)
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@@ -1,108 +0,0 @@
|
||||
# Copyright 2008-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
|
||||
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
|
||||
SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/17"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="emacs examples static-libs test zlib"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="emacs? ( virtual/emacs )"
|
||||
DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )
|
||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
||||
RDEPEND="emacs? ( virtual/emacs )
|
||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
|
||||
"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
|
||||
"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
|
||||
"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
|
||||
)
|
||||
|
||||
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local options=(
|
||||
$(use_enable static-libs static)
|
||||
$(use_with zlib)
|
||||
)
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
# Build system uses protoc when building, so protoc copy runnable on host is needed.
|
||||
mkdir -p "${WORKDIR}/build" || die
|
||||
pushd "${WORKDIR}/build" > /dev/null || die
|
||||
ECONF_SOURCE="${S}" econf_build "${options[@]}"
|
||||
options+=(--with-protoc="$(pwd)/src/protoc")
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${options[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
multilib-minimal_src_compile
|
||||
|
||||
if use emacs; then
|
||||
elisp-compile editors/protobuf-mode.el
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if tc-is-cross-compiler; then
|
||||
emake -C "${WORKDIR}/build/src" protoc
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${D}" -name "*.la" -delete || die
|
||||
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins editors/proto.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/proto.vim"
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} editors/protobuf-mode.el*
|
||||
elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
DOCS+=(examples)
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@@ -1,108 +0,0 @@
|
||||
# Copyright 2008-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
|
||||
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
|
||||
SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/17"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="emacs examples static-libs test zlib"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="emacs? ( virtual/emacs )"
|
||||
DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )
|
||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
||||
RDEPEND="emacs? ( virtual/emacs )
|
||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
|
||||
"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
|
||||
"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
|
||||
"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
|
||||
)
|
||||
|
||||
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local options=(
|
||||
$(use_enable static-libs static)
|
||||
$(use_with zlib)
|
||||
)
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
# Build system uses protoc when building, so protoc copy runnable on host is needed.
|
||||
mkdir -p "${WORKDIR}/build" || die
|
||||
pushd "${WORKDIR}/build" > /dev/null || die
|
||||
ECONF_SOURCE="${S}" econf_build "${options[@]}"
|
||||
options+=(--with-protoc="$(pwd)/src/protoc")
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${options[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
multilib-minimal_src_compile
|
||||
|
||||
if use emacs; then
|
||||
elisp-compile editors/protobuf-mode.el
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if tc-is-cross-compiler; then
|
||||
emake -C "${WORKDIR}/build/src" protoc
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${D}" -name "*.la" -delete || die
|
||||
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins editors/proto.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/proto.vim"
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} editors/protobuf-mode.el*
|
||||
elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
DOCS+=(examples)
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@@ -1,106 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
|
||||
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
|
||||
SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/17"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="emacs examples static-libs test zlib"
|
||||
|
||||
RDEPEND="emacs? ( virtual/emacs )
|
||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
|
||||
"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
|
||||
"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
|
||||
"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
|
||||
)
|
||||
|
||||
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local options=(
|
||||
$(use_enable static-libs static)
|
||||
$(use_with zlib)
|
||||
)
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
# Build system uses protoc when building, so protoc copy runnable on host is needed.
|
||||
mkdir -p "${WORKDIR}/build" || die
|
||||
pushd "${WORKDIR}/build" > /dev/null || die
|
||||
ECONF_SOURCE="${S}" econf_build "${options[@]}"
|
||||
options+=(--with-protoc="$(pwd)/src/protoc")
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${options[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
multilib-minimal_src_compile
|
||||
|
||||
if use emacs; then
|
||||
elisp-compile editors/protobuf-mode.el
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if tc-is-cross-compiler; then
|
||||
emake -C "${WORKDIR}/build/src" protoc
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${D}" -name "*.la" -delete || die
|
||||
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins editors/proto.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/proto.vim"
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} editors/protobuf-mode.el*
|
||||
elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
DOCS+=(examples)
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
Reference in New Issue
Block a user