diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-08-26 00:23:39 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-08-26 00:23:39 +0000 |
| commit | eb8617df333cadbe406b06b0b4044f03223bc158 (patch) | |
| tree | a082df58c52a4c5f9d5bb5e772983c4b1b35a00d /security | |
| parent | Fix pessimizing moves in devel/llvm36, for the benefit of other ports (diff) | |
Fix security/obfsclient build with clang 3.7.0.
PR: ports/202581
Submitted by: dim
Notes
Notes:
svn path=/head/; revision=395327
Diffstat (limited to 'security')
| -rw-r--r-- | security/obfsclient/Makefile | 2 | ||||
| -rw-r--r-- | security/obfsclient/files/patch-ext-easylogging++.h | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/security/obfsclient/Makefile b/security/obfsclient/Makefile index 744b069505be..169a37630de9 100644 --- a/security/obfsclient/Makefile +++ b/security/obfsclient/Makefile @@ -3,7 +3,7 @@ PORTNAME= obfsclient PORTVERSION= 0.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= fk@fabiankeil.de diff --git a/security/obfsclient/files/patch-ext-easylogging++.h b/security/obfsclient/files/patch-ext-easylogging++.h new file mode 100644 index 000000000000..a7414ccaa527 --- /dev/null +++ b/security/obfsclient/files/patch-ext-easylogging++.h @@ -0,0 +1,20 @@ +--- src/ext/easylogging++.h.orig 2014-03-28 09:35:09.000000000 +0100 ++++ src/ext/easylogging++.h 2015-08-23 00:44:41.276551000 +0200 +@@ -3586,7 +3586,7 @@ class LogMessage { + LogMessage(const Level& level, const char* file, unsigned long int line, const char* func, // NOLINT + base::VRegistry::VLevel verboseLevel, Logger* logger) : + m_level(level), m_file(file), m_line(line), m_func(func), +- m_verboseLevel(verboseLevel), m_logger(logger), m_message(std::move(logger->stream().str())) { ++ m_verboseLevel(verboseLevel), m_logger(logger), m_message(logger->stream().str()) { + } + inline const Level& level(void) const { return m_level; } + inline const char* file(void) const { return m_file; } +@@ -3895,7 +3895,7 @@ class LogDispatcher : base::NoCopy { + if (ELPP->hasFlag(LoggingFlag::StrictLogFileSizeCheck)) { + tc->validateFileRolling(m_logMessage.level(), ELPP->preRollOutHandler()); + } +- dispatch(std::move(m_logMessage.logger()->logBuilder()->build(&m_logMessage, m_dispatchAction == base::DispatchAction::NormalLog))); ++ dispatch(m_logMessage.logger()->logBuilder()->build(&m_logMessage, m_dispatchAction == base::DispatchAction::NormalLog)); + if (lockLogger) { + m_logMessage.logger()->unlock(); + } |