1From 8515ceec5ba3e2fcdbc819b5bf10fe742d7c9d5d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 27 Jun 2019 13:27:18 +0000
4Subject: [PATCH] Makefile.am: include descriptor.pb.cc when building
5 libprotoc.so
6
7* otherwise plugin.pb.o has undefined symbol scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto
8  and build with gold fails with:
9  core2-32-oe-linux/protobuf/3.8.0-r0/recipe-sysroot-native/usr/bin/i686-oe-linux/../../libexec/i686-oe-linux/gcc/i686-oe-linux/9.1.0/ld.bfd: ./.libs/libprotoc.so: undefined reference to `descriptor_table_google_2fprotobuf_2fdescriptor_2eproto'
10  core2-32-oe-linux/protobuf/3.8.0-r0/recipe-sysroot-native/usr/bin/i686-oe-linux/../../libexec/i686-oe-linux/gcc/i686-oe-linux/9.1.0/ld.bfd: ./.libs/libprotoc.so: undefined reference to `scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto'
11
12Upstream-Status: Pending
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14
15---
16 src/Makefile.am | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/src/Makefile.am b/src/Makefile.am
20index d4f11ce79..96d911746 100644
21--- a/src/Makefile.am
22+++ b/src/Makefile.am
23@@ -323,6 +323,7 @@ libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map
24 EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map
25 endif
26 libprotoc_la_SOURCES =                                         \
27+  google/protobuf/descriptor.pb.cc                             \
28   google/protobuf/compiler/code_generator.cc                   \
29   google/protobuf/compiler/command_line_interface.cc           \
30   google/protobuf/compiler/cpp/cpp_enum.cc                     \
31