From a73b3b2d753fa4734cec0c8a3effa910fe550f71 Mon Sep 17 00:00:00 2001 From: Amol Bhave Date: Wed, 8 May 2019 21:34:22 -0700 Subject: [PATCH] domoticz: disable searching for boost-cmake Summary: This package fails to compile with boost 1.70 when the boost cmake config gets used. As far as I can tell, Boost 1.70 introduced BoostConfigVersion.cmake. In that file, the value of PACKAGE_VERSION is set to 1.70. This makes CMake auto set the variable Boost_VERSION to 1.70. Historically, Boost_VERSION has been using the format like 170000, and not 1.70. Some package cmake files still depend on this behavior and make assertions such as Boost_VERSION > 168000. This is incompatible with the new scheme. Test Plan: `make package/domoticz/compile` Also compiled all other packages that have a boost dependency, they seem to be working fine. tested on nbg6817 Signed-off-by: Amol Bhave [split unrelated change, change commit subject, alphabetical order] Signed-off-by: Stijn Tintel --- utils/domoticz/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/domoticz/Makefile b/utils/domoticz/Makefile index 9f66981ba..7bd2ae06b 100644 --- a/utils/domoticz/Makefile +++ b/utils/domoticz/Makefile @@ -12,7 +12,7 @@ PKG_VERSION_MAJOR:=4 PKG_VERSION_PATCH:=9700 PKG_COMMIT:= PKG_VERSION:=$(PKG_VERSION_MAJOR).$(PKG_VERSION_PATCH) -PKG_RELEASE:=2 +PKG_RELEASE:=3 ifeq ($(PKG_COMMIT),) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -63,6 +63,7 @@ endef CMAKE_OPTIONS += \ -DBUILD_SHARED_LIBS=yes \ + -DBoost_NO_BOOST_CMAKE=yes \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_BUILTIN_MQTT=no \ -DUSE_BUILTIN_SQLITE=no \