| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From 321709837f412e2f590e36e3fe33571bb40036a7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Thu, 27 Jun 2019 13:27:18 +0000 |
| 4 | Subject: [PATCH] Makefile.am: include descriptor.pb.cc when building libprotoc.so |
| 5 | |
| 6 | * otherwise plugin.pb.o has undefined symbol scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto |
| 7 | and build with gold fails with: |
| 8 | 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' |
| 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 `scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto' |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 13 | --- |
| 14 | src/Makefile.am | 1 + |
| 15 | 1 file changed, 1 insertion(+) |
| 16 | |
| 17 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 18 | index be18ba761..57e3daec1 100644 |
| 19 | --- a/src/Makefile.am |
| 20 | +++ b/src/Makefile.am |
| 21 | @@ -313,6 +313,7 @@ libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map |
| 22 | EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map |
| 23 | endif |
| 24 | libprotoc_la_SOURCES = \ |
| 25 | + google/protobuf/descriptor.pb.cc \ |
| 26 | google/protobuf/compiler/code_generator.cc \ |
| 27 | google/protobuf/compiler/command_line_interface.cc \ |
| 28 | google/protobuf/compiler/plugin.cc \ |