Merge pull request #2661 from salzmdan/master

Update liburcu, add libedit and update knot
This commit is contained in:
champtar
2016-05-09 22:22:33 +02:00
6 changed files with 118 additions and 27 deletions
+54
View File
@@ -0,0 +1,54 @@
#
# Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=libedit
PKG_VERSION:=20150325-3.1
PKG_RELEASE:=1
PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
PKG_LICENSE:=BSD-3-Clause
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thrysoee.dk/editline/
PKG_MD5SUM:=43cdb5df3061d78b5e9d59109871b4f6
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/libedit
SECTION:=libs
CATEGORY:=Libraries
TITLE:=BSD editline and history library
URL:=http://thrysoee.dk/editline/
DEPENDS:=+libncurses
endef
define Package/libedit/description
Generic line editing, history, and tokenization functions similar to GNU Readline.
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/include/editline
$(CP) $(PKG_INSTALL_DIR)/usr/include/editline/*.h $(1)/usr/include/editline/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libedit.{a,so*} $(1)/usr/lib/
endef
define Package/libedit/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libedit.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libedit))
+6 -5
View File
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 OpenWrt.org
# Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
# Copyright (C) 2014-2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,13 +9,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=liburcu
PKG_VERSION:=0.8.7
PKG_VERSION:=0.9.2
PKG_RELEASE:=1
PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
PKG_LICENSE:=LGPL-2.1 GPL-2.0 GPL-3.0 MIT
PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=userspace-rcu-$(PKG_VERSION)
PKG_SOURCE_URL:=https://lttng.org/files/urcu/
PKG_MD5SUM:=7a6ee17871d31226db3f618e28351d22
PKG_MD5SUM:=49f86e68c1e2f41d303381a271b791d1
PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1
@@ -29,7 +31,6 @@ define Package/liburcu
CATEGORY:=Libraries
TITLE:=User-space Read-Copy-Update library
URL:=https://lttng.org/
MAINTAINER:=daniel.salzman@nic.cz
DEPENDS:=+libpthread
endef