mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-01 13:40:04 +00:00
log4cplus: Fix build with gold linker
Fixes a potential linker error and eventual linker crash when using gold linker arm-yoe-linux-gnueabi/9.1.0/ld: internal error in add_output_section_to_load, at ../../gold/output.cc:4149 collect2: error: ld returned 1 exit status Makefile:1979: recipe for target 'liblog4cplusU.la' failed make[2]: *** [liblog4cplusU.la] Error 1 Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Adrian Bunk <bunk@stusta.de> Cc: Mingli Yu <mingli.yu@windriver.com>
This commit is contained in:
+40
@@ -0,0 +1,40 @@
|
|||||||
|
From da5338e68f146efadab7c221291ba4c949d8f12f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vaclav Haisman <vhaisman@gmail.com>
|
||||||
|
Date: Sun, 21 Jul 2019 23:23:16 -0700
|
||||||
|
Subject: [PATCH] Remove log4cplus version entry from ELF .comment section
|
||||||
|
|
||||||
|
Reverts
|
||||||
|
https://github.com/log4cplus/log4cplus/commit/9cb0d4ade619da4e40628c9b95ff51de3df29f1b
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://github.com/log4cplus/log4cplus/commit/7e6addc70dffd2e30e902efd18eb845c5d5dd7bb]
|
||||||
|
|
||||||
|
Suggested-by: Adrian Bunk <bunk@stusta.de>
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
src/version.cxx | 12 ------------
|
||||||
|
1 file changed, 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/version.cxx b/src/version.cxx
|
||||||
|
index ce18212..e002de9 100644
|
||||||
|
--- a/src/version.cxx
|
||||||
|
+++ b/src/version.cxx
|
||||||
|
@@ -34,16 +34,4 @@ namespace log4cplus
|
||||||
|
unsigned const version = LOG4CPLUS_VERSION;
|
||||||
|
char const versionStr[] = LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX;
|
||||||
|
|
||||||
|
-namespace
|
||||||
|
-{
|
||||||
|
-
|
||||||
|
-#if defined (__ELF__) && (defined (__GNUC__) || defined (__clang__))
|
||||||
|
-char const versionStrComment[]
|
||||||
|
- __attribute__ ((__used__, __section__ ((".comment"))))
|
||||||
|
- = "log4cplus " LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX;
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-} // namespace
|
||||||
|
-
|
||||||
|
} // namespace log4cplus
|
||||||
|
--
|
||||||
|
2.22.0
|
||||||
|
|
||||||
@@ -6,7 +6,9 @@ BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/"
|
|||||||
LICENSE = "Apache-2.0 & BSD-2-Clause"
|
LICENSE = "Apache-2.0 & BSD-2-Clause"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b"
|
||||||
|
|
||||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz"
|
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \
|
||||||
|
file://0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch \
|
||||||
|
"
|
||||||
SRC_URI[md5sum] = "2b5b7bc294698bf30a315a259ef9eec2"
|
SRC_URI[md5sum] = "2b5b7bc294698bf30a315a259ef9eec2"
|
||||||
SRC_URI[sha256sum] = "196eedbc7f2dd792dae721b1159c7ac132255bb368226353c24d4d5fa7c7797a"
|
SRC_URI[sha256sum] = "196eedbc7f2dd792dae721b1159c7ac132255bb368226353c24d4d5fa7c7797a"
|
||||||
|
|
||||||
@@ -16,3 +18,5 @@ UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P<pver>\d+(\.\d+)+)/"
|
|||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
|
CXXFLAGS += "-fuse-ld=gold"
|
||||||
|
|||||||
Reference in New Issue
Block a user