<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/03e977add031301f57ca69729d829c607fe8d316">https://github.com/macports/macports-ports/commit/03e977add031301f57ca69729d829c607fe8d316</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 03e977a log4cpp: better fix for the appenderMapStorageInitializer issue.
</span>03e977a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 03e977add031301f57ca69729d829c607fe8d316
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed May 3 21:26:12 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> log4cpp: better fix for the appenderMapStorageInitializer issue.
</span>---
devel/log4cpp/Portfile | 2 +-
devel/log4cpp/files/appenderMapStorageInitializer.patch | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cpp/Portfile b/devel/log4cpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 994e602..7463cc7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/log4cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/log4cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name log4cpp
version 1.1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cpp/files/appenderMapStorageInitializer.patch b/devel/log4cpp/files/appenderMapStorageInitializer.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 02b9187..499eaed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/log4cpp/files/appenderMapStorageInitializer.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/log4cpp/files/appenderMapStorageInitializer.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove appenderMapStorageInitializer static variable, because:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(1) that's not how it should be declared; and (2) it's not used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-internal to log4cpp & thus probably should not be externally either.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/log4cpp/Appender.hh.orig 2017-04-18 00:50:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/log4cpp/Appender.hh 2017-04-27 21:58:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/log4cpp/Appender.hh.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/log4cpp/Appender.hh
</span> @@ -161,7 +161,6 @@
static AppenderMapStorage &_appenderMapStorageInstance;
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,3 +8,13 @@ internal to log4cpp & thus probably should not be externally either.
</span> typedef std::set<Appender *> AppenderSet;
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Appender.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Appender.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace log4cpp {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static Appender::AppenderMapStorageInitializer appenderMapStorageInitializer; // static initializer for every translation unit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int appenders_nifty_counter; // zero initialized at load time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char appenderMapStorage_buf[sizeof(Appender::AppenderMapStorage)]; // memory for the nifty-counter singleton object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Appender::AppenderMapStorage &Appender::_appenderMapStorageInstance = reinterpret_cast<Appender::AppenderMapStorage&> (appenderMapStorage_buf); // memory for placement new
</span></pre><pre style='margin:0'>
</pre>