3 files changed, 43 insertions, 37 deletions
diff --git a/package/linknx/0002-musl-cdefs.patch b/package/linknx/0002-musl-cdefs.patch
deleted file mode 100644
index 59e28ca706..0000000000
--- a/package/linknx/0002-musl-cdefs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Do not use the non-standard <sys/cdefs.h> header
-
-<sys/cdefs.h> is glibc-specific, and should be used only internally by
-glibc, not by external libraries/programs. It is not available in all
-standard C libraries.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(Patch sent upstream: https://sourceforge.net/p/linknx/patches/21/)
-
-diff -uNr linknx-0.0.1.32.org/include/eibclient.h linknx-0.0.1.32/include/eibclient.h
---- linknx-0.0.1.32.org/include/eibclient.h	2007-10-11 01:55:33.000000000 +0200
-+++ linknx-0.0.1.32/include/eibclient.h	2016-01-23 23:21:17.315006629 +0100
-@@ -27,11 +27,12 @@
- #ifndef EIBCLIENT_H
- #define EIBCLIENT_H
- 
--#include "sys/cdefs.h"
- #include "stdint.h"
- #include <pthsem.h>
- 
--__BEGIN_DECLS;
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- #include "eibloadresult.h"
- 
-@@ -705,5 +706,8 @@
-  */
- int EIB_LoadImage_async (EIBConnection * con, const uint8_t * image, int len);
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
diff --git a/package/linknx/0002-src-suncalc.cpp-fix-build-with-gcc-6.x.patch b/package/linknx/0002-src-suncalc.cpp-fix-build-with-gcc-6.x.patch
new file mode 100644
index 0000000000..d204a02269
--- /dev/null
+++ b/package/linknx/0002-src-suncalc.cpp-fix-build-with-gcc-6.x.patch
@@ -0,0 +1,42 @@
+From ff52cf04c6fa8b3352544447abf429bfa6000dc8 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 20 Aug 2016 12:13:04 +0200
+Subject: [PATCH] src/suncalc.cpp: fix build with gcc 6.x
+
+src/suncalc.cpp currently includes <math.h>, but this causes a build
+failure with gcc 6.x, and <cmath> should be used instead. The build
+failure is:
+
+/home/test/autobuild/run/instance-0/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.1.1/cmath:101:37: error: '__is_integer' was not declared in this scope
+     typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
+                                     ^~~~~~~~~~~~
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/suncalc.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/suncalc.cpp b/src/suncalc.cpp
+index ea2366a..b553f96 100644
+--- a/src/suncalc.cpp
++++ b/src/suncalc.cpp
+@@ -22,6 +22,8 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++#include <cmath>
++
+ #include "suncalc.h"
+ #include "services.h"
+ 
+@@ -44,7 +46,6 @@ Released to the public domain by Paul Schlyter, December 1992
+ 
+ 
+ #include <stdio.h>
+-#include <math.h>
+ #include <time.h>
+ #include <stdlib.h>
+ #include <getopt.h>
+-- 
+2.7.4
+
diff --git a/package/linknx/Config.in b/package/linknx/Config.in
index ca55c8bfb2..e85838990e 100644
--- a/package/linknx/Config.in
+++ b/package/linknx/Config.in
@@ -11,6 +11,7 @@ config BR2_PACKAGE_LINKNX
 	  to EIB/KNX installation.
 
 	  http://linknx.sourceforge.net/
+	  https://github.com/linknx/linknx
 
 comment "linknx needs a toolchain w/ C++"
 	depends on BR2_USE_MMU