mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-14 03:10:47 +00:00
Code Issues Releases Activity

dns/dnsdist: unbreak with boost 1.67

Browse Source 
In file included from dnsdist.cc:44:
In file included from ./dnsdist.hh:46:
In file included from /usr/local/include/boost/uuid/uuid_generators.hpp:17:
In file included from /usr/local/include/boost/uuid/random_generator.hpp:19:
In file included from /usr/local/include/boost/tti/has_member_function.hpp:15:
In file included from /usr/local/include/boost/tti/detail/dmem_fun.hpp:11:
In file included from /usr/local/include/boost/function_types/is_member_function_pointer.hpp:14:
In file included from /usr/local/include/boost/function_types/components.hpp:61:
/usr/local/include/boost/function_types/detail/class_transform.hpp:26:31: error: expected a qualified name after 'typename'
template<typename T, typename L>
                              ^
./dns.hh:238:11: note: expanded from macro 'L'
 #define L theL()
           ^

PR:		227427
Reported by:	antoine (via exp-run)
Obtained from:	upstream
This commit is contained in:
Jan Beich 2018-04-17 09:33:39 +00:00
parent 5d7b41d825
commit 66ef9ea047
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=467588
1 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dns/dnsdist/files/patch-boost-1.67 Normal file
View File

@ -0,0 +1,53 @@
https://github.com/PowerDNS/pdns/commit/e6a9dde524b5
--- dns.hh.orig 2018-03-29 15:25:58 UTC
+++ dns.hh
@@ -235,7 +235,6 @@ inline uint16_t * getFlagsFromDNSHeader(struct dnshead
#define FLAGS_CD_OFFSET (12)
#endif
-#define L theL()
extern time_t s_starttime;
uint32_t hashQuestion(const char* packet, uint16_t len, uint32_t init);
--- dnsdist-carbon.cc.orig 2018-03-29 15:25:58 UTC
+++ dnsdist-carbon.cc
@@ -27,7 +27,6 @@
#include "sstuff.hh"
#include "namespaces.hh"
-#undef L
#include "dnsdist.hh"
GlobalStateHolder<vector<CarbonConfig> > g_carbon;
--- dnsdist.cc.orig 2018-03-29 15:25:58 UTC
+++ dnsdist.cc
@@ -2258,7 +2258,7 @@ try
bindAny(cs->local.sin4.sin_family, cs->udpFD);
// if (!setSocketTimestamps(cs->udpFD))
- // L<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl;
+ // g_log<<Logger::Warning<<"Unable to enable timestamp reporting for socket"<<endl;
if(IsAnyAddress(cs->local)) {
--- remote_logger.cc.orig 2018-03-29 15:25:58 UTC
+++ remote_logger.cc
@@ -22,7 +22,7 @@ bool RemoteLogger::reconnect()
}
catch(const std::exception& e) {
#ifdef WE_ARE_RECURSOR
- L<<Logger::Warning<<"Error connecting to remote logger "<<d_remote.toStringWithPort()<<": "<<e.what()<<std::endl;
+ g_log<<Logger::Warning<<"Error connecting to remote logger "<<d_remote.toStringWithPort()<<": "<<e.what()<<std::endl;
#else
warnlog("Error connecting to remote logger %s: %s", d_remote.toStringWithPort(), e.what());
#endif
@@ -63,7 +63,7 @@ void RemoteLogger::worker()
}
catch(const std::runtime_error& e) {
#ifdef WE_ARE_RECURSOR
- L<<Logger::Info<<"Error sending data to remote logger "<<d_remote.toStringWithPort()<<": "<< e.what()<<endl;
+ g_log<<Logger::Info<<"Error sending data to remote logger "<<d_remote.toStringWithPort()<<": "<< e.what()<<endl;
#else
vinfolog("Error sending data to remote logger (%s): %s", d_remote.toStringWithPort(), e.what());
#endif