From: Francis Dupont <fdupont@isc.org>
Date: Sat, 25 Jun 2016 16:26:42 +0000 (+0200)
Subject: [4283] Ignore unused parameter in asio* Makefile for clang
X-Git-Tag: trac4551_base~34^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56d5b65f391720a07840a2604dda072fced5b53b;p=thirdparty%2Fkea.git

[4283] Ignore unused parameter in asio* Makefile for clang
---

diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am
index 24dfe05c30..3dfd000e8c 100644
--- a/src/lib/asiodns/Makefile.am
+++ b/src/lib/asiodns/Makefile.am
@@ -26,8 +26,12 @@ EXTRA_DIST = asiodns_messages.mes
 
 # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
 # KEA_CXXFLAGS)
-libkea_asiodns_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_asiodns_la_CPPFLAGS = $(AM_CPPFLAGS)
+libkea_asiodns_la_CXXFLAGS = $(AM_CXXFLAGS)
+if USE_CLANGPP
+# Avoid ASIO header unused-paramet problem with clang
+libkea_asiodns_la_CXXFLAGS += -Wno-unused-parameter
+endif
 libkea_asiodns_la_LIBADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
 libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index 806aef7c0f..cc2fa41852 100644
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -9,9 +9,18 @@ CLEANFILES = *.gcno *.gcda
 
 # This is a wrapper library.
 
+libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
+# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
+# KEA_CXXFLAGS)
+libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
+
 # The ASIO header files have some code fragments that would hit
 # gcc's unused-parameter warning, which would make the build fail
 # with -Werror (our default setting).
+if USE_CLANGPP
+# Avoid this problem with clang
+libkea_asiolink_la_CXXFLAGS += -Wno-unused-parameter
+endif
 
 lib_LTLIBRARIES = libkea-asiolink.la
 
@@ -32,10 +41,6 @@ libkea_asiolink_la_SOURCES += tcp_socket.h
 libkea_asiolink_la_SOURCES += udp_endpoint.h
 libkea_asiolink_la_SOURCES += udp_socket.h
 
-# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
-# KEA_CXXFLAGS)
-libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
-libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_asiolink_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_asiolink_la_LIBADD += $(BOOST_LIBS)