bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] memcached: update to 1.4.11 (#10804), add missing libpthread dependency, use PKG_INSTALL, refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29784 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2012-01-19 00:46:53 +00:00
parent 76fe2c1cf7
commit fc96e6ba20
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/memcached/Makefile
View File

@ -1,6 +1,6 @@
# #
# Copyright (C) 2009-2011 OpenWrt.org # Copyright (C) 2009-2012 OpenWrt.org
# Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de> # Copyright (C) 2009-2012 Thomas Heil <heil@terminal-consulting.de>
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,19 +9,21 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=memcached PKG_NAME:=memcached
PKG_VERSION:=1.4.7 PKG_VERSION:=1.4.11
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://memcached.googlecode.com/files PKG_SOURCE_URL:=http://memcached.googlecode.com/files
PKG_MD5SUM:=cf0becfa65753c3b5a1fc8f84861bb23 PKG_MD5SUM:=50ee313639531d4d2f8eb9c688f58948
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/memcached define Package/memcached
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libevent DEPENDS:=+libevent +libpthread
TITLE:=The high-performance, distributed memory object caching system TITLE:=The high-performance, distributed memory object caching system
MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
URL:=http://memcached.org/ URL:=http://memcached.org/
@ -44,15 +46,15 @@ endif
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-docs \ --disable-docs \
--disable-dtrace \ --disable-dtrace \
--disable-coverage \ --disable-coverage \
--disable-sasl --disable-sasl
TARGET_CFLAGS+= \ TARGET_CFLAGS += \
-std=gnu99 -std=gnu99
define Package/memcached/install define Package/memcached/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/memcached $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/memcached $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/memcached.config $(1)/etc/config/memcached $(INSTALL_CONF) ./files/memcached.config $(1)/etc/config/memcached
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d

6
net/memcached/patches/100-fix_iov_max.patch
View File

@ -1,8 +1,8 @@
--- a/memcached.c --- a/memcached.c
+++ b/memcached.c +++ b/memcached.c
@@ -15,6 +15,10 @@ @@ -13,6 +13,10 @@
std * * Anatoly Vorobey <mellon@pobox.com>
* $Id$ * Brad Fitzpatrick <brad@danga.com>
*/ */
+#ifndef __need_IOV_MAX +#ifndef __need_IOV_MAX
+#define __need_IOV_MAX +#define __need_IOV_MAX