summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/domoticz/0001-add-proper-check-for-detecting-header-execinfo.h.patch58
-rw-r--r--package/domoticz/domoticz.hash2
-rw-r--r--package/domoticz/domoticz.mk2
3 files changed, 2 insertions, 60 deletions
diff --git a/package/domoticz/0001-add-proper-check-for-detecting-header-execinfo.h.patch b/package/domoticz/0001-add-proper-check-for-detecting-header-execinfo.h.patch
deleted file mode 100644
index 55bbb7dc99..0000000000
--- a/package/domoticz/0001-add-proper-check-for-detecting-header-execinfo.h.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f0da50118f7bd01ed7fa97e75b790a8232d8d4dc Mon Sep 17 00:00:00 2001
-From: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
-Date: Thu, 25 Aug 2016 17:23:38 +0530
-Subject: [PATCH] add proper check for detecting header <execinfo.h>
-
-domoticz.cpp currently assumes that on GNU/Linux systems header
-<execinfo.h> is available. But that is not true. Since it provided by
-C library and uClibc can be built without backtrace support. And in
-such cases we get following build error.
-
- domoticz-3.4834/main/domoticz.cpp:48:22: fatal error: execinfo.h: No such file or directory
- #include <execinfo.h>
- ^
- compilation terminated.
-
-Instead of depending on __gnu_linux__, add check for detecting
-presence of <execinfo.h> and guard code for dumpstack accordingly.
-
-This build failure is detected by Buildroot autobuilder.
-http://autobuild.buildroot.net/results/393/393f839e160b51ca12ac36058718ad2f0c1b50a6/
-
-Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
----
- CMakeLists.txt | 7 +++++++
- main/domoticz.cpp | 2 +-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-Index: b/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -61,6 +61,13 @@
- "Where to put the executables for Domoticz"
- )
-
-+INCLUDE(CheckIncludeFiles)
-+CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
-+
-+IF(HAVE_EXECINFO_H)
-+ ADD_DEFINITIONS(-DHAVE_EXECINFO_H)
-+ENDIF(HAVE_EXECINFO_H)
-+
- #set(CMAKE_EXE_LINKER_FLAGS "-static")
-
- # Macro for setting up precompiled headers. Usage:
-Index: b/main/domoticz.cpp
-===================================================================
---- a/main/domoticz.cpp
-+++ b/main/domoticz.cpp
-@@ -44,7 +44,7 @@
- #include <string.h>
- #endif
-
--#ifdef __gnu_linux__
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
- static void dumpstack(void) {
- // Notes :
diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash
index 9180a9b159..b56bb95b7e 100644
--- a/package/domoticz/domoticz.hash
+++ b/package/domoticz/domoticz.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 02b4cdde8e376258aeae3d5621edf8bb6b3563c34282e50194db343fcec9c0f5 domoticz-3.4834.tar.gz
+sha256 f5eaa8db192c314374deb8d58471f3a338da1397be635ebaa4b1a5f664450b05 domoticz-87286ee76ad15420c52689f1e4eeeab56fb04d40.tar.gz
diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk
index adcf06172e..aceae2d3d2 100644
--- a/package/domoticz/domoticz.mk
+++ b/package/domoticz/domoticz.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOMOTICZ_VERSION = 3.4834
+DOMOTICZ_VERSION = 87286ee76ad15420c52689f1e4eeeab56fb04d40
DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
DOMOTICZ_LICENSE = GPLv3
DOMOTICZ_LICENSE_FILES = License.txt
OpenPOWER on IntegriCloud