diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2014-07-19 11:35:33 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-07-19 17:14:10 +0200 |
| commit | 0be26ad401a6e869c8b456d0935737c8dc2ea8d0 (patch) | |
| tree | e37e81ee3dc8a13d3a94e4700332b0b22690c49d /package/libmemcached | |
| parent | ad4a90617c5365de94ea021126c176f74eb3d30e (diff) | |
libmemcached: disable libtest
This allows libmemcached to be enabled for musl and uClibc as well.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libmemcached')
| -rw-r--r-- | package/libmemcached/Config.in | 6 | ||||
| -rw-r--r-- | package/libmemcached/libmemcached-01-disable-tests.patch | 32 |
2 files changed, 31 insertions, 7 deletions
diff --git a/package/libmemcached/Config.in b/package/libmemcached/Config.in index e9dd2c477..4af2b3b0e 100644 --- a/package/libmemcached/Config.in +++ b/package/libmemcached/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBMEMCACHED bool "libmemcached" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_USES_GLIBC # posix spawn, va_list breakage help libMemcached is an open source C/C++ client library and tools for the memcached server. @@ -11,6 +10,5 @@ config BR2_PACKAGE_LIBMEMCACHED http://libmemcached.org/libMemcached.html -comment "libmemcached needs a (e)glibc toolchain w/ C++, threads" - depends on !BR2_TOOLCHAIN_USES_GLIBC \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "libmemcached needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libmemcached/libmemcached-01-disable-tests.patch b/package/libmemcached/libmemcached-01-disable-tests.patch index d7da101c2..612830678 100644 --- a/package/libmemcached/libmemcached-01-disable-tests.patch +++ b/package/libmemcached/libmemcached-01-disable-tests.patch @@ -4,9 +4,26 @@ with extra dependencies. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> diff -Nura libmemcached-1.0.18.orig/Makefile.am libmemcached-1.0.18/Makefile.am ---- libmemcached-1.0.18.orig/Makefile.am 2014-07-19 08:43:15.127031040 -0300 -+++ libmemcached-1.0.18/Makefile.am 2014-07-19 08:48:11.327068987 -0300 -@@ -76,7 +76,6 @@ +--- libmemcached-1.0.18.orig/Makefile.am 2014-07-19 09:24:45.246418899 -0300 ++++ libmemcached-1.0.18/Makefile.am 2014-07-19 09:25:12.701349345 -0300 +@@ -1,6 +1,6 @@ + # vim:ft=automake + +-ACLOCAL_AMFLAGS= -I m4 -I libtest/m4 ++ACLOCAL_AMFLAGS= -I m4 + AM_YFLAGS= -d + + # includes append to these: +@@ -45,8 +45,6 @@ + include libmemcached-1.0/include.am + else + +-include libtest/include.am +- + include libhashkit-1.0/include.am + include libmemcached-1.0/include.am + +@@ -76,7 +74,6 @@ include libmemcachedinternal/util/include.am include rpm/include.mk include support/include.am @@ -14,3 +31,12 @@ diff -Nura libmemcached-1.0.18.orig/Makefile.am libmemcached-1.0.18/Makefile.am include util/include.am include win32/include.am +@@ -103,7 +100,7 @@ + @echo "Files that need to be either removed or checked in:" + @bzr unknowns + +-clean-local: clean-libtest-check clean-docs-check clean-rpm ++clean-local: clean-docs-check clean-rpm + + + lcov: lcov-clean check |