X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Flibs%2Flibubox%2FMakefile;h=ea440c4fc51ea3d742d09444358d7b88fd9ee03a;hb=11a3dbb677c3f3e875efbe8cd298cc3e99748402;hp=4ca3112b5eab9865f109e92039382ece316932fc;hpb=24f9418f759261572929db27514809c23928e57f;p=openwrt.git

diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index 4ca3112b5e..ea440c4fc5 100644
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -1,18 +1,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_VERSION:=2012-10-29
+PKG_VERSION:=2013-03-05
 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:=49e6e062b8effe281a85de167c16c5f039b74442
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=bb8401a9a747f5841780d1ca47661008
+PKG_MIRROR_MD5SUM:=b32d297d846b271585925f190fad2c60
 CMAKE_INSTALL:=1
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=ISC BSD-3c
 PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
@@ -47,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/
@@ -65,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))