X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Flibs%2Flibubox%2FMakefile;h=e756467030e203eb1e885c0c411ccc146655eedf;hb=84ceca514841dd6d4705dc27d2104ee0aa18b9e1;hp=ffdb19a0a269d1df1bbeb5b6e87de404a221cee6;hpb=0fd4ebe2bd59c8669e3f10176fcfaf5eda1e7476;p=librecmc%2Flibrecmc.git

diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index ffdb19a0a2..e756467030 100644
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -1,25 +1,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_VERSION:=2014-03-18
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://nbd.name/luci2/libubox.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4f44401ae8d23465261cef80b87630ffccd5a864
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=
+PKG_SOURCE_URL=$(LEDE_GIT)/project/libubox.git
+PKG_SOURCE_DATE:=2017-02-03
+PKG_SOURCE_VERSION:=de3f14b643f09c799845073eaf3577a334d0726d
+PKG_MIRROR_HASH:=a797e1d329f544807caf2fdb8bb6706aaeae6a5c2eede921839f2659f774b3c7
 CMAKE_INSTALL:=1
 
-PKG_LICENSE:=ISC BSD-3c
+PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_DEPENDS:=lua
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/libubox
@@ -40,7 +39,7 @@ endef
 define Package/jshn
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libjson-c
+  DEPENDS:=+libjson-c +libubox +libblobmsg-json
   TITLE:=JSON SHell Notation
 endef
 
@@ -92,8 +91,21 @@ define Package/libubox-lua/install
 	$(CP) $(PKG_BUILD_DIR)/lua/uloop.so $(1)/usr/lib/lua/
 endef
 
+
+CMAKE_HOST_OPTIONS += \
+	-DBUILD_LUA=OFF \
+	-DBUILD_EXAMPLES=OFF \
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/include/libubox
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/*.h $(STAGING_DIR_HOST)/include/libubox/
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/lib
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/libubox.{a,so} $(STAGING_DIR_HOST)/lib/
+endef
+
 $(eval $(call BuildPackage,libubox))
 $(eval $(call BuildPackage,libblobmsg-json))
 $(eval $(call BuildPackage,jshn))
 $(eval $(call BuildPackage,libjson-script))
 $(eval $(call BuildPackage,libubox-lua))
+$(eval $(call HostBuild))