Commit 07dd809f authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰

[4283] Compilation fix for boost issue on FreeBSD 10.0

parent 56d5b65f
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment