blob: 488c1f6ff903e8421074c9592936a95ba05bbe78 [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From ddb9c5147883f8b27b4205450139e4a115d9961f Mon Sep 17 00:00:00 2001
2From: Kyungjik Min <dp.min@lge.com>
3Date: Mon, 28 Dec 2020 15:56:09 +0900
4Subject: [PATCH] Fix linking error with ld-gold
5
6:Release Notes:
7
8:Detailed Notes:
9https://github.com/protocolbuffers/protobuf/issues/6113
10There's a bug in the CMake build leading it to not use the version
11scripts, which hides the problem (because all symbols are now public)
12but doesn't solve it properly.
13
14:Testing Performed:
15
16:QA Notes:
17N/A
18
19:Issues Addressed:
20[PLAT-130467] Fix build error for libgoogleassistant with latest
21 protobuf-3.11.4
22---
23 src/libprotobuf-lite.map | 2 ++
24 src/libprotobuf.map | 2 ++
25 src/libprotoc.map | 2 ++
26 3 files changed, 6 insertions(+)
27
28diff --git a/src/libprotobuf-lite.map b/src/libprotobuf-lite.map
29index 391554669..a1853ca6c 100644
30--- a/src/libprotobuf-lite.map
31+++ b/src/libprotobuf-lite.map
32@@ -3,6 +3,8 @@
33 extern "C++" {
34 *google*;
35 };
36+ scc_info_*;
37+ descriptor_table_*;
38
39 local:
40 *;
41diff --git a/src/libprotobuf.map b/src/libprotobuf.map
42index 391554669..a1853ca6c 100644
43--- a/src/libprotobuf.map
44+++ b/src/libprotobuf.map
45@@ -3,6 +3,8 @@
46 extern "C++" {
47 *google*;
48 };
49+ scc_info_*;
50+ descriptor_table_*;
51
52 local:
53 *;
54diff --git a/src/libprotoc.map b/src/libprotoc.map
55index 391554669..a1853ca6c 100644
56--- a/src/libprotoc.map
57+++ b/src/libprotoc.map
58@@ -3,6 +3,8 @@
59 extern "C++" {
60 *google*;
61 };
62+ scc_info_*;
63+ descriptor_table_*;
64
65 local:
66 *;
67--
682.17.1
69