rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation with buildroot

Browse Source
This commit is contained in:
jbnadal
2018-04-05 19:55:54 +02:00
parent 9df77ec9e3
commit 4f76e2485e
5 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/buildroot_external/package/domod/Config.in
View File

@@ -1,7 +1,7 @@
config BR2_PACKAGE_DOMOD
bool "domod"
select BR2_PACKAGE_LIBUBUS_CPP
select BR2_PACKAGE_JSONCPP
select BR2_PACKAGE_JSON_C
default n
help
This program is the main domo daemon.

8
bsp/buildroot_external/package/domod/domod.mk
View File

@@ -10,12 +10,8 @@ DOMOD_SITE = $(TOPDIR)/../../src/prog/domod/builders/cmake
DOMOD_SITE_METHOD = local
DOMOD_INSTALL_STAGING = YES
DOMOD_DEPENDENCIES = libubus-cpp jsoncpp
DOMOD_DEPENDENCIES = libubus-cpp json-c
DOMOD_CONF = SRC_DIR=$(TOPDIR)/../..
DOMOD_CONF_ENV = $(DOMOD_CONF)
DOMOD_MAKE_ENV = $(DOMOD_CONF)
DOMOD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
DOMOD_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package))

6
bsp/buildroot_external/package/libubus-cpp/libubus-cpp.mk
View File

@@ -12,10 +12,6 @@ LIBUBUS_CPP_INSTALL_STAGING = YES
LIBUBUS_CPP_DEPENDENCIES = libubox ubus json-c
LIBUBUS_CPP_CONF = SRC_DIR=$(TOPDIR)/../..
LIBUBUS_CPP_CONF_ENV = $(LIBUBUS_CPP_CONF)
LIBUBUS_CPP_MAKE_ENV = $(LIBUBUS_CPP_CONF)
LIBUBUS_CPP_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
LIBUBUS_CPP_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package))