Merge pull request #2372 from jprjr/memcached-fixes

memcached: fix build in musl, add -devel subpkg
This commit is contained in:
Enno Boland 2015-08-26 17:26:09 +02:00
commit 478ccf1679
3 changed files with 49 additions and 3 deletions

1
srcpkgs/memcached-devel Symbolic link
View File

@ -0,0 +1 @@
memcached

View File

@ -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 <sys/stat.h>
#include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/resource.h>
#include <fcntl.h>
#include <netinet/in.h>
diff --git items.c items.c
index 4a22af9..53847be 100644
--- items.c
+++ items.c
@@ -2,7 +2,7 @@
#include "memcached.h"
#include <sys/stat.h>
#include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/resource.h>
#include <fcntl.h>
#include <netinet/in.h>
diff --git slabs.c slabs.c
index c9e29ac..92dffe2 100644
--- slabs.c
+++ slabs.c
@@ -10,7 +10,7 @@
#include "memcached.h"
#include <sys/stat.h>
#include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/resource.h>
#include <fcntl.h>
#include <netinet/in.h>

View File

@ -1,7 +1,7 @@
# Template file for 'memcached' # Template file for 'memcached'
pkgname=memcached pkgname=memcached
version=1.4.24 version=1.4.24
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
makedepends="libevent-devel" makedepends="libevent-devel"
short_desc="A distributed memory object caching system" 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" distfiles="http://${pkgname}.org/files/${pkgname}-${version}.tar.gz"
checksum=08a426c504ecf64633151eec1058584754d2f54e62e5ed2d6808559401617e55 checksum=08a426c504ecf64633151eec1058584754d2f54e62e5ed2d6808559401617e55
post_install() { memcached-devel_package() {
rm -rf ${DESTDIR}/usr/include short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
}
} }