From 70f4e77f1573b55be6591ad343baf4aee52babed Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 31 Oct 2012 19:07:18 +0000
Subject: libubox: sync with trunk r34037 to merge the uloop timer fix

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34038 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/libubox/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/libubox/Makefile b/package/libubox/Makefile
index 845f38070..316f6c914 100644
--- a/package/libubox/Makefile
+++ b/package/libubox/Makefile
@@ -1,17 +1,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_VERSION:=2012-07-08
+PKG_VERSION:=2012-10-31
 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:=cca2ed6c8cdb3555fea43ff63ba1c9905dd7a164
+PKG_SOURCE_VERSION:=33b9f3aa0b59feb3c492684cdb4a5340ef3f18d9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=dfd44c10b4aeccbdab9ae22774fb02e3
+PKG_MIRROR_MD5SUM:=b6586a49212b67b6e93019e7b4618e03
 CMAKE_INSTALL:=1
 
+PKG_BUILD_DEPENDS:=lua
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -41,6 +43,8 @@ define Package/jshn/description
 endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+CMAKE_OPTIONS = \
+	-DLUAPATH=/usr/lib/lua
 
 define Package/libubox/install
 	$(INSTALL_DIR) $(1)/lib/
-- 
cgit v1.2.3