1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
|
class Gearman < Formula
homepage "http://gearman.org/"
url "https://launchpad.net/gearmand/1.2/1.1.12/+download/gearmand-1.1.12.tar.gz"
sha256 "973d7a3523141a84c7b757c6f243febbc89a3631e919b532c056c814d8738acb"
bottle do
revision 1
sha256 "a3eaa2cb9241381c6679fe9f9547c0477ba0f1b860f97a405b4f4d8d8b0d7c81" => :yosemite
sha256 "a843fcbaf51130d36e86362fd832444de1815c1e546b3590b257eada0e6c6597" => :mavericks
sha256 "0637f412fcb5d0c324c9d63120bd8ea4809d826e729d1c357438c690f95ae954" => :mountain_lion
end
option "with-mysql", "Compile with MySQL persistent queue enabled"
option "with-postgresql", "Compile with Postgresql persistent queue enabled"
# https://bugs.launchpad.net/gearmand/+bug/1318151 - Still ongoing as of 1.1.12
# https://bugs.launchpad.net/gearmand/+bug/1236815 - Still ongoing as of 1.1.12
# https://github.com/Homebrew/homebrew/issues/33246 - Still ongoing as of 1.1.12
patch :DATA
depends_on "pkg-config" => :build
depends_on "boost"
depends_on "libevent"
depends_on "libpqxx" if build.with? "postgresql"
depends_on :mysql => :optional
depends_on :postgresql => :optional
depends_on "hiredis" => :optional
depends_on "libmemcached" => :optional
depends_on "openssl" => :optional
depends_on "cyassl" => :optional
depends_on "tokyo-cabinet" => :optional
def install
# https://bugs.launchpad.net/gearmand/+bug/1368926
Dir["tests/**/*.cc", "libtest/main.cc"].each do |test_file|
next unless /std::unique_ptr/ === File.read(test_file)
inreplace test_file, "std::unique_ptr", "std::auto_ptr"
end
args = [
"--prefix=#{prefix}",
"--localstatedir=#{var}",
"--disable-silent-rules",
"--disable-dependency-tracking",
"--disable-libdrizzle",
"--with-boost=#{Formula["boost"].prefix}",
"--with-sqlite3"
]
if build.with? "cyassl"
args << "--enable-ssl" << "--enable-cyassl"
elsif build.with? "openssl"
args << "--enable-ssl" << "--with-openssl=#{Formula["openssl"].prefix}" << "--disable-cyassl"
else
args << "--disable-ssl" << "--disable-cyassl"
end
if build.with? "postgresql"
args << "--enable-libpq" << "--with-postgresql=#{Formula["postgresql"].opt_bin}/pg_config"
else
args << "--disable-libpq" << "--without-postgresql"
end
if build.with? "libmemcached"
args << "--enable-libmemcached" << "--with-memcached=#{Formula["memcached"].opt_bin}/memcached"
else
args << "--disable-libmemcached" << "--without-memcached"
end
args << "--disable-libtokyocabinet" if build.without? "tokyo-cabinet"
args << (build.with?("mysql") ? "--with-mysql=#{Formula["mysql"].opt_bin}/mysql_config" : "--without-mysql")
args << (build.with?("hiredis") ? "--enable-hiredis" : "--disable-hiredis")
ENV.append_to_cflags "-DHAVE_HTONLL"
(var/"log").mkpath
system "./configure", *args
system "make", "install"
end
plist_options :manual => "gearmand -d"
def plist; <<-EOS.undent
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>#{plist_name}</string>
<key>Program</key>
<string>#{opt_sbin}/gearmand</string>
<key>RunAtLoad</key>
<true/>
</dict>
</plist>
EOS
end
end
__END__
diff --git a/libgearman-1.0/gearman.h b/libgearman-1.0/gearman.h
index 7f6d5e7..8f7a8f0 100644
--- a/libgearman-1.0/gearman.h
+++ b/libgearman-1.0/gearman.h
@@ -50,7 +50,11 @@
#endif
#ifdef __cplusplus
+#ifdef _LIBCPP_VERSION
# include <cinttypes>
+#else
+# include <tr1/cinttypes>
+#endif
# include <cstddef>
# include <cstdlib>
# include <ctime>
diff --git a/libgearman/byteorder.cc b/libgearman/byteorder.cc
index 674fed9..96f0650 100644
--- a/libgearman/byteorder.cc
+++ b/libgearman/byteorder.cc
@@ -65,6 +65,8 @@ static inline uint64_t swap64(uint64_t in)
}
#endif
+#ifndef HAVE_HTONLL
+
uint64_t ntohll(uint64_t value)
{
return swap64(value);
@@ -74,3 +76,5 @@ uint64_t htonll(uint64_t value)
{
return swap64(value);
}
+
+#endif
\ No newline at end of file
diff --git a/libgearman/client.cc b/libgearman/client.cc
index 3db2348..4363b36 100644
--- a/libgearman/client.cc
+++ b/libgearman/client.cc
@@ -599,7 +599,7 @@ gearman_return_t gearman_client_add_server(gearman_client_st *client_shell,
{
Client* client= client_shell->impl();
- if (gearman_connection_create(client->universal, host, port) == false)
+ if (gearman_connection_create(client->universal, host, port) == NULL)
{
assert(client->error_code() != GEARMAN_SUCCESS);
return client->error_code();
@@ -614,7 +614,7 @@ gearman_return_t gearman_client_add_server(gearman_client_st *client_shell,
gearman_return_t Client::add_server(const char *host, const char* service_)
{
- if (gearman_connection_create(universal, host, service_) == false)
+ if (gearman_connection_create(universal, host, service_) == NULL)
{
assert(error_code() != GEARMAN_SUCCESS);
return error_code();
@@ -946,7 +946,7 @@ gearman_return_t gearman_client_job_status(gearman_client_st *client_shell,
*denominator= do_task->impl()->denominator;
}
- if (is_known == false and is_running == false)
+ if (! is_known and ! is_running)
{
if (do_task->impl()->options.is_running)
{
|
