| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From da5338e68f146efadab7c221291ba4c949d8f12f Mon Sep 17 00:00:00 2001 |
| 2 | From: Vaclav Haisman <vhaisman@gmail.com> |
| 3 | Date: Sun, 21 Jul 2019 23:23:16 -0700 |
| 4 | Subject: [PATCH] Remove log4cplus version entry from ELF .comment section |
| 5 | |
| 6 | Reverts |
| 7 | https://github.com/log4cplus/log4cplus/commit/9cb0d4ade619da4e40628c9b95ff51de3df29f1b |
| 8 | |
| 9 | Upstream-Status: Backport [https://github.com/log4cplus/log4cplus/commit/7e6addc70dffd2e30e902efd18eb845c5d5dd7bb] |
| 10 | |
| 11 | Suggested-by: Adrian Bunk <bunk@stusta.de> |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | src/version.cxx | 12 ------------ |
| 15 | 1 file changed, 12 deletions(-) |
| 16 | |
| 17 | diff --git a/src/version.cxx b/src/version.cxx |
| 18 | index ce18212..e002de9 100644 |
| 19 | --- a/src/version.cxx |
| 20 | +++ b/src/version.cxx |
| 21 | @@ -34,16 +34,4 @@ namespace log4cplus |
| 22 | unsigned const version = LOG4CPLUS_VERSION; |
| 23 | char const versionStr[] = LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; |
| 24 | |
| 25 | -namespace |
| 26 | -{ |
| 27 | - |
| 28 | -#if defined (__ELF__) && (defined (__GNUC__) || defined (__clang__)) |
| 29 | -char const versionStrComment[] |
| 30 | - __attribute__ ((__used__, __section__ ((".comment")))) |
| 31 | - = "log4cplus " LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; |
| 32 | -#endif |
| 33 | - |
| 34 | - |
| 35 | -} // namespace |
| 36 | - |
| 37 | } // namespace log4cplus |
| 38 | -- |
| 39 | 2.22.0 |
| 40 | |