From f29359e7b14786fa7f74eebcbfd31b93bcd2a654 Mon Sep 17 00:00:00 2001 From: John Regan Date: Tue, 25 Aug 2015 16:51:01 -0400 Subject: [PATCH] memcached: fix build in musl, add -devel subpkg --- srcpkgs/memcached-devel | 1 + .../patches/memcached-1.4.24-fix-signal.patch | 40 +++++++++++++++++++ srcpkgs/memcached/template | 11 +++-- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/memcached-devel create mode 100644 srcpkgs/memcached/patches/memcached-1.4.24-fix-signal.patch diff --git a/srcpkgs/memcached-devel b/srcpkgs/memcached-devel new file mode 120000 index 0000000000..ec229f22a4 --- /dev/null +++ b/srcpkgs/memcached-devel @@ -0,0 +1 @@ +memcached \ No newline at end of file diff --git a/srcpkgs/memcached/patches/memcached-1.4.24-fix-signal.patch b/srcpkgs/memcached/patches/memcached-1.4.24-fix-signal.patch new file mode 100644 index 0000000000..8da32babe7 --- /dev/null +++ b/srcpkgs/memcached/patches/memcached-1.4.24-fix-signal.patch @@ -0,0 +1,40 @@ +diff --git assoc.c assoc.c +index e6cf09b..cc29611 100644 +--- assoc.c ++++ assoc.c +@@ -14,7 +14,7 @@ + #include "memcached.h" + #include + #include +-#include ++#include + #include + #include + #include +diff --git items.c items.c +index 4a22af9..53847be 100644 +--- items.c ++++ items.c +@@ -2,7 +2,7 @@ + #include "memcached.h" + #include + #include +-#include ++#include + #include + #include + #include +diff --git slabs.c slabs.c +index c9e29ac..92dffe2 100644 +--- slabs.c ++++ slabs.c +@@ -10,7 +10,7 @@ + #include "memcached.h" + #include + #include +-#include ++#include + #include + #include + #include + diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template index ffa684595d..e32523609f 100644 --- a/srcpkgs/memcached/template +++ b/srcpkgs/memcached/template @@ -1,7 +1,7 @@ # Template file for 'memcached' pkgname=memcached version=1.4.24 -revision=1 +revision=2 build_style=gnu-configure makedepends="libevent-devel" short_desc="A distributed memory object caching system" @@ -11,6 +11,11 @@ homepage="http://www.memcached.org" distfiles="http://${pkgname}.org/files/${pkgname}-${version}.tar.gz" checksum=08a426c504ecf64633151eec1058584754d2f54e62e5ed2d6808559401617e55 -post_install() { - rm -rf ${DESTDIR}/usr/include +memcached-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + } } +