From 5b71a3b9b9dee52efa4b75253609dd0f23b8c506 Mon Sep 17 00:00:00 2001 From: bert hubert Date: Thu, 26 Nov 2015 18:41:00 +0100 Subject: [PATCH] remove boost serialization which actually shaves seconds off ./configure and probably more off our build times --- configure.ac | 2 -- pdns/Makefile.am | 12 +++--------- pdns/dns.hh | 2 -- pdns/dnsname.hh | 6 ------ pdns/ueberbackend.cc | 2 -- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 74746484e..6f0bdfa62 100644 --- a/configure.ac +++ b/configure.ac @@ -115,8 +115,6 @@ PDNS_CHECK_CLOCK_GETTIME BOOST_REQUIRE([1.35]) BOOST_FOREACH BOOST_PROGRAM_OPTIONS([mt]) -BOOST_SERIALIZATION([mt]) - PDNS_ENABLE_UNIT_TESTS PDNS_ENABLE_REPRODUCIBLE diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 2af90eb98..c5a25a46a 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -204,15 +204,13 @@ pdns_server_SOURCES = \ pdns_server_LDFLAGS = \ $(AM_LDFLAGS) \ - $(DYNLINKFLAGS) \ - $(BOOST_SERIALIZATION_LDFLAGS) + $(DYNLINKFLAGS) pdns_server_LDADD = \ @moduleobjects@ \ @modulelibs@ \ $(LIBDL) \ $(MBEDTLS_LIBS) \ - $(BOOST_SERIALIZATION_LIBS) \ $(YAHTTP_LIBS) if BOTAN110 @@ -305,8 +303,7 @@ pdnssec_SOURCES = \ pdnssec_LDFLAGS = \ $(AM_LDFLAGS) \ $(DYNLINKFLAGS) \ - $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \ - $(BOOST_SERIALIZATION_LDFLAGS) + $(BOOST_PROGRAM_OPTIONS_LDFLAGS) pdnssec_LDADD = \ @moduleobjects@ \ @@ -314,7 +311,6 @@ pdnssec_LDADD = \ $(LIBDL) \ $(MBEDTLS_LIBS) \ $(BOOST_PROGRAM_OPTIONS_LIBS) \ - $(BOOST_SERIALIZATION_LIBS) \ $(YAHTTP_LIBS) if BOTAN110 @@ -1064,13 +1060,11 @@ testrunner_SOURCES = \ testrunner_LDFLAGS = \ $(AM_LDFLAGS) \ - $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) \ - $(BOOST_SERIALIZATION_LDFLAGS) + $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) testrunner_LDADD = \ $(MBEDTLS_LIBS) \ $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \ - $(BOOST_SERIALIZATION_LIBS) \ $(RT_LIBS) \ $(LIBDL) diff --git a/pdns/dns.hh b/pdns/dns.hh index 9295b5363..24e40aa92 100644 --- a/pdns/dns.hh +++ b/pdns/dns.hh @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include "qtype.hh" #include "dnsname.hh" #include diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh index 6b43fa96f..ff1495c77 100644 --- a/pdns/dnsname.hh +++ b/pdns/dnsname.hh @@ -85,12 +85,6 @@ public: }); // note that this is case insensitive, including on the label lengths } - template - void serialize(Archive &ar, const unsigned int version) - { - ar & d_storage; - } - inline bool canonCompare(const DNSName& rhs) const; bool slowCanonCompare(const DNSName& rhs) const; private: diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc index 6de8c33ea..169e86916 100644 --- a/pdns/ueberbackend.cc +++ b/pdns/ueberbackend.cc @@ -45,8 +45,6 @@ #include "dnspacket.hh" #include "logger.hh" #include "statbag.hh" -#include - extern StatBag S; -- 2.40.0