Files
meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch
Khem Raj 3a7abb175a 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>
2019-07-23 07:31:56 -07:00

41 lines
1.2 KiB
Diff

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