From 6cc0ad6ecd78763fbf53a2730a28afb912db1249 Mon Sep 17 00:00:00 2001 From: heil Date: Mon, 24 Aug 2015 10:54:30 +0200 Subject: [PATCH] memcached: fix musl build - thx to alpinelinux for the patch (http://git.alpinelinux.org/cgit/aports/plain/main/memcached/musl-includes.patch) - remove depency to libenvent and replace it libevent2 should fix issue #1542 Signed-off-by: heil --- net/memcached/Makefile | 4 +- net/memcached/patches/001-musl-compat.patch | 47 +++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 net/memcached/patches/001-musl-compat.patch diff --git a/net/memcached/Makefile b/net/memcached/Makefile index 111b14d57..211cfe054 100644 --- a/net/memcached/Makefile +++ b/net/memcached/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=memcached PKG_VERSION:=1.4.24 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://memcached.org/files @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk define Package/memcached SECTION:=net CATEGORY:=Network - DEPENDS:=+libevent +libpthread + DEPENDS:=+libevent2 +libpthread TITLE:=The high-performance, distributed memory object caching system URL:=http://memcached.org/ endef diff --git a/net/memcached/patches/001-musl-compat.patch b/net/memcached/patches/001-musl-compat.patch new file mode 100644 index 000000000..558931e4f --- /dev/null +++ b/net/memcached/patches/001-musl-compat.patch @@ -0,0 +1,47 @@ +--- memcached-1.4.15.orig/assoc.c ++++ memcached-1.4.15/assoc.c +@@ -14,8 +14,8 @@ + #include "memcached.h" + #include + #include +-#include + #include ++#include + #include + #include + #include +--- memcached-1.4.15.orig/items.c ++++ memcached-1.4.15/items.c +@@ -2,13 +2,13 @@ + #include "memcached.h" + #include + #include +-#include + #include + #include + #include + #include + #include + #include ++#include + #include + #include + #include +--- memcached-1.4.15.orig/slabs.c ++++ memcached-1.4.15/slabs.c +@@ -10,7 +10,6 @@ + #include "memcached.h" + #include + #include +-#include + #include + #include + #include +@@ -18,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include +