From d9b29fe5e605d1fff34b67a9ac63bebe44c5ef9d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 7 Apr 2019 17:20:01 -0700 Subject: [PATCH 1/2] vim: Add host build to install xxd Packages such as ttyd and device-observatory need this. Signed-off-by: Rosen Penev (cherry picked from commit 8e93386b804f8029a1180755ce240fbc0f06b009) --- utils/vim/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/vim/Makefile b/utils/vim/Makefile index 2480c2657..9cfb936d4 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -20,7 +20,11 @@ PKG_MAINTAINER:=Marko Ratkaj PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER) PKG_BUILD_PARALLEL:=1 +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(VIMVER) +HOST_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/vim/Default SECTION:=utils @@ -237,3 +241,4 @@ $(eval $(call BuildPackage,vim-fuller)) $(eval $(call BuildPackage,vim-runtime)) $(eval $(call BuildPackage,vim-help)) $(eval $(call BuildPackage,xxd)) +$(eval $(call HostBuild)) From f50edf52d3c5df25d021e441e787605831571b61 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 10 Apr 2019 14:55:37 -0700 Subject: [PATCH 2/2] ttyd: Add dependency for vim Needed to avoid error in case xxd is not installed: [ 16%] Generating html.h from index.html /bin/sh: 1: CMAKE_XXD-NOTFOUND: not found CMakeFiles/ttyd.dir/build.make:61: recipe for target 'html.h' failed make[6]: *** [html.h] Error 127 Signed-off-by: Rosen Penev (cherry picked from commit 773c19afad0723bc2ba49b36e8172776e2eaf207) --- utils/ttyd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/ttyd/Makefile b/utils/ttyd/Makefile index e029097c5..4613934e1 100644 --- a/utils/ttyd/Makefile +++ b/utils/ttyd/Makefile @@ -12,7 +12,6 @@ PKG_VERSION:=1.4.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.github.com/tsl0922/ttyd/tar.gz/$(PKG_VERSION)? PKG_SOURCE_VERSION=$(PKG_VERSION) PKG_HASH=757a9b5b5dd3de801d7db8fab6035d97ea144b02a51c78bdab28a8e07bcf05d6 @@ -20,6 +19,7 @@ PKG_HASH=757a9b5b5dd3de801d7db8fab6035d97ea144b02a51c78bdab28a8e07bcf05d6 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DEPENDS:=vim/host CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk