From 7e65f9ea09c472f10f090cc43060220ab2304f80 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 24 May 2013 13:03:21 +0000 Subject: [PATCH] AA: backport libubox from trunk SVN-Revision: 36704 --- package/libubox/Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/package/libubox/Makefile b/package/libubox/Makefile index 217dd45294..9865dc2bef 100644 --- a/package/libubox/Makefile +++ b/package/libubox/Makefile @@ -1,15 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libubox -PKG_VERSION:=2013-01-29 +PKG_VERSION:=2013-04-15 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:=0bc317aa4d9af44806c28ca286d79a8b5a92b2b8 +PKG_SOURCE_VERSION:=dcf93f332270bdaddb5d24fdba6e3eb5b1f7d80a PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_MD5SUM:=c79ef80b71127e114d73701fbdc895c3 +PKG_MIRROR_MD5SUM:= CMAKE_INSTALL:=1 PKG_LICENSE:=ISC BSD-3c @@ -47,6 +47,13 @@ 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 @@ -67,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)) -- 2.30.2