diff options
| -rw-r--r-- | recipes/linknx/files/logger-initialisations.patch | 59 | ||||
| -rw-r--r-- | recipes/linknx/linknx_0.0.1.26.bb | 9 | ||||
| -rw-r--r-- | recipes/linknx/linknx_0.0.1.27.bb | 9 | ||||
| -rw-r--r-- | recipes/linknx/linknx_cvs.bb | 2 |
4 files changed, 10 insertions, 69 deletions
diff --git a/recipes/linknx/files/logger-initialisations.patch b/recipes/linknx/files/logger-initialisations.patch deleted file mode 100644 index 857014ea79..0000000000 --- a/recipes/linknx/files/logger-initialisations.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: linknx/src/logger.h -=================================================================== -RCS file: /cvsroot/linknx/linknx/linknx/src/logger.h,v -retrieving revision 1.5 -diff -u -r1.5 logger.h ---- linknx/src/logger.h 8 Mar 2009 22:34:23 -0000 1.5 -+++ linknx/src/logger.h 17 May 2009 22:29:02 -0000 -@@ -132,7 +132,7 @@ - std::string cat_m; - typedef std::pair<std::string ,Logger*> LoggerPair_t; - typedef std::map<std::string ,Logger*> LoggerMap_t; -- static LoggerMap_t loggerMap_m; -+ static LoggerMap_t* getLoggerMap(); - static int level_m; // 10=DEBUG, 20=INFO, 30=NOTICE, 40=WARN, 50=ERROR, - static bool timestamp_m; - static std::ostream nullStream_m; -Index: linknx/src/logger.cpp -=================================================================== -RCS file: /cvsroot/linknx/linknx/linknx/src/logger.cpp,v -retrieving revision 1.6 -diff -u -r1.6 logger.cpp ---- linknx/src/logger.cpp 12 Mar 2009 21:56:55 -0000 1.6 -+++ linknx/src/logger.cpp 17 May 2009 22:29:02 -0000 -@@ -118,7 +118,7 @@ - - #include <ctime> - --Logger::LoggerMap_t Logger::loggerMap_m; -+//Logger::LoggerMap_t Logger::loggerMap_m; - int Logger::level_m; - bool Logger::timestamp_m; - NullStreamBuf Logger::nullStreamBuf_m; -@@ -157,14 +157,23 @@ - pConfig->SetAttribute("level", level_m); - } - -+Logger::LoggerMap_t* Logger::getLoggerMap() { -+ // This static local is used to avoid problems with -+ // initialization order of static object present in -+ // different compilation units -+ static LoggerMap_t* loggerMap = new LoggerMap_t(); -+ return loggerMap; -+} -+ - Logger& Logger::getInstance(const char* cat) { -- LoggerMap_t::iterator it = loggerMap_m.find(cat); -+ LoggerMap_t* map = getLoggerMap(); -+ LoggerMap_t::iterator it = map->find(cat); - Logger* logger; -- if (it != loggerMap_m.end()) -+ if (it != map->end()) - logger = it->second; - else { - logger = new Logger(cat); -- loggerMap_m.insert(LoggerPair_t(cat, logger)); -+ map->insert(LoggerPair_t(cat, logger)); - } - return *(logger); - } diff --git a/recipes/linknx/linknx_0.0.1.26.bb b/recipes/linknx/linknx_0.0.1.26.bb deleted file mode 100644 index a195d0cd97..0000000000 --- a/recipes/linknx/linknx_0.0.1.26.bb +++ /dev/null @@ -1,9 +0,0 @@ -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/linknx/linknx-${PV}.tar.gz \ - file://logger-initialisations.patch \ - " - -require linknx.inc -SRC_URI[md5sum] = "21956fe0ca7072e08b8fe096c61c4f2d" -SRC_URI[sha256sum] = "cbc7e781fad9ac4704b7bf24b95e3de480fbcce6884e595109d18d0027d3b2fa" diff --git a/recipes/linknx/linknx_0.0.1.27.bb b/recipes/linknx/linknx_0.0.1.27.bb new file mode 100644 index 0000000000..be3cee03b1 --- /dev/null +++ b/recipes/linknx/linknx_0.0.1.27.bb @@ -0,0 +1,9 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/linknx/linknx-${PV}.tar.gz \ + " + +require linknx.inc + +SRC_URI[md5sum] = "00d473efe99e117ff832f39d1eae7abc" +SRC_URI[sha256sum] = "01455fb9e041882ddd055da7a4f65854bae5331de5724b39f32beacd5c8ed8d4" diff --git a/recipes/linknx/linknx_cvs.bb b/recipes/linknx/linknx_cvs.bb index 579e61551d..67b1d72429 100644 --- a/recipes/linknx/linknx_cvs.bb +++ b/recipes/linknx/linknx_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0.1.26+cvs${SRCDATE}" +PV = "0.0.1.27+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@linknx.cvs.sourceforge.net/cvsroot/linknx;module=linknx;method=pserver " S = "${WORKDIR}/linknx/linknx" |