From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 1 Jul 2016 16:43:38 +0000 (+0200)
Subject: [4283] Compilation fix for boost issue on FreeBSD 10.0
X-Git-Tag: trac4551_base~34^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07dd809f598851a7dbfa9cfb4bd369390e555842;p=thirdparty%2Fkea.git

[4283] Compilation fix for boost issue on FreeBSD 10.0
---

diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am
index bf6d1887b0..bd737903b4 100644
--- a/src/bin/perfdhcp/Makefile.am
+++ b/src/bin/perfdhcp/Makefile.am
@@ -12,11 +12,17 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS)
 # But older GCC compilers don't have the flag.
 AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 
+if USE_CLANGPP
+# Workaround unused parameters in boost version included in FreeBSD 10
+AM_CXXFLAGS += -Wno-unused-parameter
+endif
+
 AM_LDFLAGS = -lm
 if USE_STATIC_LINK
 AM_LDFLAGS += -static
 endif
 
+
 # convenience archive
 
 noinst_LTLIBRARIES = libperfdhcp.la
diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am
index 8a734761f8..436097a08c 100644
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@ -4,6 +4,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+if USE_CLANGPP
+# Workaround unused parameters in boost version included in FreeBSD 10
+AM_CXXFLAGS += -Wno-unused-parameter
+endif
+
 lib_LTLIBRARIES = libkea-cc.la
 libkea_cc_la_SOURCES = data.cc data.h
 libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 76c534fabb..d0bc492a82 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -6,6 +6,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+if USE_CLANGPP
+# Workaround unused parameters in boost version included in FreeBSD 10
+AM_CXXFLAGS += -Wno-unused-parameter
+endif
+
 CLEANFILES = *.gcno *.gcda
 CLEANFILES += s-rdatacode
 # These two are created with rrtype/class.h, so not explicitly listed in
diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index e3d56421dd..ff059de15b 100644
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -17,6 +17,11 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 # Disabling the strict aliasing rule suppresses this warning.
 AM_CXXFLAGS += $(WARNING_GCC_44_STRICT_ALIASING_CFLAG)
 
+if USE_CLANGPP
+# Workaround unused parameters in boost version included in FreeBSD 10
+AM_CXXFLAGS += -Wno-unused-parameter
+endif
+
 lib_LTLIBRARIES = libkea-eval.la
 libkea_eval_la_SOURCES  =
 libkea_eval_la_SOURCES += eval_log.cc eval_log.h
diff --git a/src/lib/log/compiler/Makefile.am b/src/lib/log/compiler/Makefile.am
index 45474a5c89..aa5398de91 100644
--- a/src/lib/log/compiler/Makefile.am
+++ b/src/lib/log/compiler/Makefile.am
@@ -5,6 +5,12 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+# This check is for clang complaining about unused parameter
+# in boost version included in FreeBSD 10.
+if USE_CLANGPP
+AM_CXXFLAGS +=-Wno-unused-parameter
+endif
+
 if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index d50e8fa9d8..41f84e7d9e 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -10,6 +10,11 @@ if USE_STATIC_LINK
 AM_LDFLAGS += -static
 endif
 
+if USE_CLANGPP
+# Workaround unused parameters in boost version included in FreeBSD 10
+AM_CXXFLAGS += -Wno-unused-parameter
+endif
+
 CLEANFILES = *.gcno *.gcda *.lock
 
 EXTRA_DIST = log_test_messages.mes
@@ -73,7 +78,7 @@ TESTS =
 TESTSCXXFLAGS  = $(AM_CXXFLAGS)
 if USE_CLANGPP
 # Workaround unused variables tcout and tcerr in log4cplus's streams.h.
-TESTSCXXFLAGS += -Wno-unused-variable
+TESTSCXXFLAGS += -Wno-unused-variable -Wno-unused-parameter
 endif
 TESTSCPPFLAGS  = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
 TESTSLDFLAGS  = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
diff --git a/src/lib/stats/Makefile.am b/src/lib/stats/Makefile.am
index 8b2deccb88..c0b3336a97 100644
--- a/src/lib/stats/Makefile.am
+++ b/src/lib/stats/Makefile.am
@@ -4,6 +4,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+if USE_CLANGPP
+# Workaround unused parameters in boost version included in FreeBSD 10
+AM_CXXFLAGS += -Wno-unused-parameter
+endif
+
+
 lib_LTLIBRARIES = libkea-stats.la
 libkea_stats_la_SOURCES = observation.h observation.cc
 libkea_stats_la_SOURCES += context.h context.cc
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index b6ba4a095a..61817770ff 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -4,8 +4,13 @@ SUBDIRS = . io unittests tests python threads
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
+
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+if USE_CLANGPP
+AM_CXXFLAGS += -Wno-unused-parameter
+endif
+
 lib_LTLIBRARIES = libkea-util.la
 libkea_util_la_SOURCES  = boost_time_utils.h boost_time_utils.cc
 libkea_util_la_SOURCES += csv_file.h csv_file.cc