Permalink
Browse files

made recent libmemcached compile under mingw32

Change-Id: I8eb65a105d12d5bab8a455f3018a0d9fb1b90759
Reviewed-on: http://review.membase.org/5188
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Steve Yen <steve.yen@gmail.com>
  • Loading branch information...
1 parent 9d74a7d commit 718c1e92bdff451e6f71ce3c7a1d795c4b7b0c43 Aliaksey Kandratsenka committed with steveyen Apr 1, 2011
Showing with 21 additions and 1 deletion.
  1. +8 −1 Makefile
  2. +13 −0 libmemcached-win32-fix.diff
View
@@ -130,13 +130,13 @@ libmemcached_OPTIONS := $(LIBRARY_OPTIONS) --disable-dtrace --without-docs
ifndef CROSS_COMPILING
libmemcached_OPTIONS += --with-memcached=$(DESTDIR)$(PREFIX)/bin/memcached
memcachetest_OPTIONS += --with-memcached=$(DESTDIR)$(PREFIX)/bin/memcached
+deps-for-libmemcached: make-install-memcached
endif
ifdef USE_TCMALLOC
libmemcached_OPTIONS += --enable-tcmalloc
endif
-deps-for-libmemcached: make-install-memcached
# tar.gz _should_ have ./configure inside, but it doesn't
# make-install-libmemcached: AUTOGEN := true
@@ -234,6 +234,8 @@ OPTIONS := --host=$(HOST) $(OPTIONS)
BAD_FLAGS += CC=$(HOST)-gcc CXX=$(HOST)-g++
endif
+libmemcached_OPTIONS += --without-memcached
+
memcached/Makefile:
@true
@@ -255,6 +257,11 @@ tmp/installed-bucket_engine:
(cd bucket_engine && $(MAKE) -f win32/Makefile.mingw $(BAD_FLAGS) all \
&& cp .libs/bucket_engine.so "$(PREFIX)/lib")
+libmemcached/Makefile: fix-broken-libmemcached-tests
+
+fix-broken-libmemcached-tests:
+ patch -p1 -N -r /dev/null -t -d libmemcached <tlm/libmemcached-win32-fix.diff || true
+
endif
AUTOCONF213 := autoconf213
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 7b866d0..91e6bca 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,7 +43,7 @@ include libmemcached/include.am
+ include clients/include.am
+ include libhashkit/include.am
+ include unittests/include.am
+-include tests/include.am
++# include tests/include.am
+ include example/include.am
+ include support/include.am
+ include poll/include.am

0 comments on commit 718c1e9

Please sign in to comment.