svn commit: r479273 - in head/net/linknx: . files

[Tobias Kortkamp]

Author: tobik
Date: Sun Sep  9 07:10:25 2018
New Revision: 479273
URL: https://svnweb.freebsd.org/changeset/ports/479273

Log:
  net/linknx: Fix build with Clang 6
  
  objectcontroller.cpp:659:27: error: non-constant-expression cannot be narrowed from type 'int' to 'uint8_t' (aka 'unsigned char') in initializer list [-Wc++11-narrowing]
      uint8_t buf[2] = { 0, (isWrite ? 0x80 : 0x40) | (getBoolObjectValue() ? 1 : 0) };
                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  http://beefy12.nyi.freebsd.org/data/head-amd64-default/p479076_s338486/logs/errors/linknx-0.0.1.32.log
  
  PR:		230897
  Submitted by:	tobik
  Approved by:	bkoenig at alpha-tierchen.de (maintainer timeout, 2 weeks)

Added:
  head/net/linknx/files/patch-src_suncalc.cpp   (contents, props changed)
Modified:
  head/net/linknx/Makefile

Modified: head/net/linknx/Makefile
==============================================================================
--- head/net/linknx/Makefile	Sun Sep  9 07:04:54 2018	(r479272)
+++ head/net/linknx/Makefile	Sun Sep  9 07:10:25 2018	(r479273)
@@ -20,10 +20,12 @@ BROKEN_armv7=		fails to configure: checking for GNU Pt
 BROKEN_mips=		fails to configure: checking for GNU Pth... Segmentation fault
 BROKEN_mips64=		fails to configure: checking for GNU Pth... Segmentation fault
 
-USES=	gmake autoreconf pkgconfig
+USES=	compiler gmake autoreconf pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-I${LOCALBASE}/include -L/${LOCALBASE}/lib"
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 OPTIONS_DEFINE=	LIBESMTP LIBCURL LIBLUA MYSQL
 OPTIONS_DEFAULT=	LIBESMTP

Added: head/net/linknx/files/patch-src_suncalc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/linknx/files/patch-src_suncalc.cpp	Sun Sep  9 07:10:25 2018	(r479273)
@@ -0,0 +1,27 @@
+In file included from suncalc.cpp:47:
+    /usr/include/c++/v1/math.h:733:39: error: no member named 'fabsf' in the global
+          namespace; did you mean simply 'fabsf'?
+          abs(float __lcpp_x) _NOEXCEPT {return ::fabsf(__lcpp_x);}
+                                                ^~
+
+--- src/suncalc.cpp.orig	2018-08-25 18:51:49 UTC
++++ src/suncalc.cpp
+@@ -25,8 +25,6 @@
+ #include "suncalc.h"
+ #include "services.h"
+ 
+-namespace suncalc
+-{
+ 
+ /*
+ SUNRISET.C - computes Sun rise/set times, start/end of twilight, and
+@@ -49,6 +47,9 @@ Released to the public domain by Paul Schlyter, Decemb
+ #include <stdlib.h>
+ #include <getopt.h>
+ #include <string.h>
++
++namespace suncalc
++{
+ 
+ /* A macro to compute the number of days elapsed since 2000 Jan 0.0 */
+ /* (which is equal to 1999 Dec 31, 0h UT)                           */