Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

memcached: Update to 1.5.14

Browse source 
Fixes compilation with GCC8.

Remove obsolete patch. Small Makefile cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-05-04 19:08:36 -07:00
parent 54e868c822
commit 73ce3f5e6c
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 4 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net/memcached/Makefile
View file

@ -9,15 +9,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=memcached PKG_NAME:=memcached
PKG_VERSION:=1.5.2 PKG_VERSION:=1.5.14
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.org/files PKG_SOURCE_URL:=https://memcached.org/files
PKG_HASH:=9ac93113bdb5d037e79c61277386564ac2e5e31d49e594f11e554e4c149b7245 PKG_HASH:=9c5bdf29a780fb6c6f7c9eaaeeda0583efdf663193758c3e316c969a510af2a9
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
@ -30,7 +29,7 @@ define Package/memcached
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libevent2 +libpthread DEPENDS:=+libevent2 +libpthread
TITLE:=The high-performance, distributed memory object caching system TITLE:=The high-performance, distributed memory object caching system
URL:=http://memcached.org/ URL:=https://memcached.org/
endef endef
define Package/memcached/description define Package/memcached/description
@ -54,12 +53,6 @@ CONFIGURE_ARGS += \
--disable-coverage \ --disable-coverage \
--disable-sasl --disable-sasl
TARGET_CFLAGS += \
-std=gnu99
TARGET_LDFLAGS = \
-L$(STAGING_DIR)/usr/lib/libevent -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
define Package/memcached/install define Package/memcached/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/memcached $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/memcached $(1)/usr/bin/

25
net/memcached/patches/100-fix_iov_max.patch
View file

@ -1,25 +0,0 @@
Index: memcached-1.4.26/memcached.c
===================================================================
--- memcached-1.4.26.orig/memcached.c
+++ memcached-1.4.26/memcached.c
@@ -13,6 +13,10 @@
* Anatoly Vorobey <mellon@pobox.com>
* Brad Fitzpatrick <brad@danga.com>
*/
+#ifndef __need_IOV_MAX
+#define __need_IOV_MAX
+#endif
+
#include "memcached.h"
#include <sys/stat.h>
#include <sys/socket.h>
@@ -30,9 +34,6 @@
#define _P1003_1B_VISIBLE
#endif
/* need this to get IOV_MAX on some platforms. */
-#ifndef __need_IOV_MAX
-#define __need_IOV_MAX
-#endif
#include <pwd.h>
#include <sys/mman.h>
#include <fcntl.h>