-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
:Release Notes: Fix linking error with ld-gold :Detailed Notes: protocolbuffers/protobuf#6113 There's a bug in the CMake build leading it to not use the version scripts, which hides the problem (because all symbols are now public) but doesn't solve it properly. :Testing Performed: Build and test done. :QA Notes: N/A :Issues Addressed: [PLAT-130506] [webOS OSE]: Service does not exist error message is displayed. [PLAT-130467] Fix build error for libgoogleassistant with latest protobuf-3.11.4 [PLAT-130489] CCC: protobuf=webos2 Change-Id: Id604f45aa06253dfffaa89c52b30c84a51f08bbc
- Loading branch information
Showing
2 changed files
with
77 additions
and
2 deletions.
There are no files selected for viewing
69 changes: 69 additions & 0 deletions
69
meta-webos/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
From ddb9c5147883f8b27b4205450139e4a115d9961f Mon Sep 17 00:00:00 2001 | ||
From: Kyungjik Min <[email protected]> | ||
Date: Mon, 28 Dec 2020 15:56:09 +0900 | ||
Subject: [PATCH] Fix linking error with ld-gold | ||
|
||
:Release Notes: | ||
|
||
:Detailed Notes: | ||
https://github.com/protocolbuffers/protobuf/issues/6113 | ||
There's a bug in the CMake build leading it to not use the version | ||
scripts, which hides the problem (because all symbols are now public) | ||
but doesn't solve it properly. | ||
|
||
:Testing Performed: | ||
|
||
:QA Notes: | ||
N/A | ||
|
||
:Issues Addressed: | ||
[PLAT-130467] Fix build error for libgoogleassistant with latest | ||
protobuf-3.11.4 | ||
--- | ||
src/libprotobuf-lite.map | 2 ++ | ||
src/libprotobuf.map | 2 ++ | ||
src/libprotoc.map | 2 ++ | ||
3 files changed, 6 insertions(+) | ||
|
||
diff --git a/src/libprotobuf-lite.map b/src/libprotobuf-lite.map | ||
index 391554669..a1853ca6c 100644 | ||
--- a/src/libprotobuf-lite.map | ||
+++ b/src/libprotobuf-lite.map | ||
@@ -3,6 +3,8 @@ | ||
extern "C++" { | ||
*google*; | ||
}; | ||
+ scc_info_*; | ||
+ descriptor_table_*; | ||
|
||
local: | ||
*; | ||
diff --git a/src/libprotobuf.map b/src/libprotobuf.map | ||
index 391554669..a1853ca6c 100644 | ||
--- a/src/libprotobuf.map | ||
+++ b/src/libprotobuf.map | ||
@@ -3,6 +3,8 @@ | ||
extern "C++" { | ||
*google*; | ||
}; | ||
+ scc_info_*; | ||
+ descriptor_table_*; | ||
|
||
local: | ||
*; | ||
diff --git a/src/libprotoc.map b/src/libprotoc.map | ||
index 391554669..a1853ca6c 100644 | ||
--- a/src/libprotoc.map | ||
+++ b/src/libprotoc.map | ||
@@ -3,6 +3,8 @@ | ||
extern "C++" { | ||
*google*; | ||
}; | ||
+ scc_info_*; | ||
+ descriptor_table_*; | ||
|
||
local: | ||
*; | ||
-- | ||
2.17.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,13 @@ | ||
# Copyright (c) 2018-2019 LG Electronics, Inc. | ||
# Copyright (c) 2018-2020 LG Electronics, Inc. | ||
|
||
EXTENDPRAUTO_append = "webos1" | ||
EXTENDPRAUTO_append = "webos2" | ||
|
||
VIRTUAL-RUNTIME_bash ?= "bash" | ||
RDEPENDS_${PN}-ptest_append_class-target = " ${VIRTUAL-RUNTIME_bash}" | ||
RDEPENDS_${PN}-ptest_remove_class-target = "${@oe.utils.conditional('WEBOS_PREFERRED_PROVIDER_FOR_BASH', 'busybox', 'bash', '', d)}" | ||
|
||
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" | ||
|
||
SRC_URI += " \ | ||
file://0001-Fix-linking-error-with-ld-gold.patch \ | ||
" |