domoticz: disable searching for boost-cmake
authorAmol Bhave <redacted>
Thu, 9 May 2019 04:34:22 +0000 (21:34 -0700)
committerStijn Tintel <redacted>
Wed, 5 Jun 2019 07:59:12 +0000 (10:59 +0300)
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 <redacted>
[split unrelated change, change commit subject, alphabetical order]
Signed-off-by: Stijn Tintel <redacted>
utils/domoticz/Makefile

index 9f66981ba55007cd6b195b15b3f2de6f75e5b55a..7bd2ae06b2c8dd885df9d5cb8128c8fd6c55d3e8 100644 (file)
@@ -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 \
git clone https://git.99rst.org/PROJECT