aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/libmemcached.rb
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula/libmemcached.rb')
-rw-r--r--Library/Formula/libmemcached.rb41
1 files changed, 30 insertions, 11 deletions
diff --git a/Library/Formula/libmemcached.rb b/Library/Formula/libmemcached.rb
index 4533f6554..47572a446 100644
--- a/Library/Formula/libmemcached.rb
+++ b/Library/Formula/libmemcached.rb
@@ -1,9 +1,9 @@
-require 'formula'
+require "formula"
class Libmemcached < Formula
- homepage 'http://libmemcached.org'
- url 'https://launchpad.net/libmemcached/1.0/1.0.17/+download/libmemcached-1.0.17.tar.gz'
- sha1 '1023bc8c738b1f5b8ea2cd16d709ec6b47c3efa8'
+ homepage "http://libmemcached.org"
+ url "https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz"
+ sha1 "8be06b5b95adbc0a7cb0f232e237b648caf783e1"
option "with-sasl", "Build with sasl support"
@@ -27,17 +27,36 @@ class Libmemcached < Formula
end
def patches
- if MacOS.version >= :mavericks and ENV.compiler == :clang
- # build fix for tr1 -> std
- DATA
- end
+ DATA
end
end
__END__
+diff --git a/clients/memflush.cc b/clients/memflush.cc
+index 8bd0dbf..cdba743 100644
+--- a/clients/memflush.cc
++++ b/clients/memflush.cc
+@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
+ {
+ options_parse(argc, argv);
+
+- if (opt_servers == false)
++ if (*opt_servers != NULL)
+ {
+ char *temp;
+
+@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
+ opt_servers= strdup(temp);
+ }
+
+- if (opt_servers == false)
++ if (*opt_servers != NULL)
+ {
+ std::cerr << "No Servers provided" << std::endl;
+ exit(EXIT_FAILURE);
diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h
-index 3c11f61..dcee395 100644
+index bc16e73..dcee395 100644
--- a/libmemcached-1.0/memcached.h
+++ b/libmemcached-1.0/memcached.h
@@ -43,7 +43,11 @@
@@ -45,9 +64,9 @@ index 3c11f61..dcee395 100644
#ifdef __cplusplus
+#ifdef _LIBCPP_VERSION
-+# include <cinttypes>
+ # include <cinttypes>
+#else
- # include <tr1/cinttypes>
++# include <tr1/cinttypes>
+#endif
# include <cstddef>
# include <cstdlib>