Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -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 :
|
||||
@@ -1,11 +1,14 @@
|
||||
config BR2_PACKAGE_DOMOTICZ
|
||||
bool "domoticz"
|
||||
depends on BR2_USE_MMU # mosquitto
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
|
||||
depends on !BR2_STATIC_LIBS # mosquitto
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3
|
||||
# These result in internal compiler error
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
|
||||
select BR2_PACKAGE_BOOST
|
||||
select BR2_PACKAGE_BOOST_DATE_TIME
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
@@ -26,6 +29,8 @@ config BR2_PACKAGE_DOMOTICZ
|
||||
|
||||
comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, threads, wchar, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_USE_WCHAR || BR2_STATIC_LIBS || \
|
||||
!(BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3)
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 02b4cdde8e376258aeae3d5621edf8bb6b3563c34282e50194db343fcec9c0f5 domoticz-3.4834.tar.gz
|
||||
sha256 fb88edbe428851a7a337a85faa93f6da00713b3ad086ff6957031dc9b3b58bba domoticz-3.5877.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOMOTICZ_VERSION = 3.4834
|
||||
DOMOTICZ_VERSION = 3.5877
|
||||
DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
|
||||
DOMOTICZ_LICENSE = GPLv3
|
||||
DOMOTICZ_LICENSE_FILES = License.txt
|
||||
|
||||
Reference in New Issue
Block a user