libubox: update to latest version, adds some helper function

[openwrt/svn-archive/archive.git] / package / libs / libubox / Makefile

diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index ba0d6b8fea073f32f06e08a5a9520fa63b040d5e..30552299a6b238f35fe6903a2c6723f3131a70f7 100644 (file)
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -1,22 +1,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_VERSION:=2012-10-29
+PKG_VERSION:=2013-06-10
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/libubox.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a9b44ebe556c3f60de2fc1154d48a26f43aa15b7
+PKG_SOURCE_VERSION:=e5032709b29eb42568c3937a533898728a15efa1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=bb8401a9a747f5841780d1ca47661008
+PKG_MIRROR_MD5SUM:=
 CMAKE_INSTALL:=1
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=ISC BSD-3c
 PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 
+PKG_BUILD_DEPENDS:=lua
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -45,7 +47,16 @@ define Package/jshn/description
   Library for parsing and generating JSON from shell scripts
 endef
 
+define Package/libjson-script
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libubox
+  TITLE:=Minimalistic JSON based scripting engine
+endef
+
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+CMAKE_OPTIONS = \
+       -DLUAPATH=/usr/lib/lua
 
 define Package/libubox/install
        $(INSTALL_DIR) $(1)/lib/
@@ -63,7 +74,12 @@ define Package/jshn/install
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libubox/jshn.sh $(1)/usr/share/libubox
 endef
 
+define Package/libjson-script/install
+       $(INSTALL_DIR) $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so $(1)/lib/
+endef
+
 $(eval $(call BuildPackage,libubox))
 $(eval $(call BuildPackage,libblobmsg-json))
 $(eval $(call BuildPackage,jshn))
-
+$(eval $(call BuildPackage,libjson-script))