<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[127173] trunk/dports/devel/libzookeeper</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/127173">127173</a></dd>
<dt>Author</dt> <dd>hum@macports.org</dd>
<dt>Date</dt> <dd>2014-10-22 03:31:00 -0700 (Wed, 22 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>libzookeeper: add patch-yosemite.diff to fix build on 10.10.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibzookeeperPortfile">trunk/dports/devel/libzookeeper/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/libzookeeper/files/</li>
<li><a href="#trunkdportsdevellibzookeeperfilespatchyosemitediff">trunk/dports/devel/libzookeeper/files/patch-yosemite.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibzookeeperPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libzookeeper/Portfile (127172 => 127173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libzookeeper/Portfile 2014-10-22 10:02:11 UTC (rev 127172)
+++ trunk/dports/devel/libzookeeper/Portfile 2014-10-22 10:31:00 UTC (rev 127173)
</span><span class="lines">@@ -33,6 +33,15 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:apache-ant
</span><span class="cx">
</span><ins>+platform darwin {
+ # ZooKeeperZOOKEEPER-2049: Yosemite build failure: htonll conflict
+ # https://issues.apache.org/jira/browse/ZOOKEEPER-2049, modified for 3.4.6
+ if {${os.major} >= 14} {
+ patchfiles-append patch-yosemite.diff
+ patch.pre_args -p2
+ }
+}
+
</ins><span class="cx"> pre-configure {
</span><span class="cx"> system -W "${worksrcpath}/../.." "ant compile_jute"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdevellibzookeeperfilespatchyosemitediff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libzookeeper/files/patch-yosemite.diff (0 => 127173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libzookeeper/files/patch-yosemite.diff (rev 0)
+++ trunk/dports/devel/libzookeeper/files/patch-yosemite.diff 2014-10-22 10:31:00 UTC (rev 127173)
</span><span class="lines">@@ -0,0 +1,106 @@
</span><ins>+diff --git src/c/include/recordio.h src/c/include/recordio.h
+index 73ada1e..65af239 100644
+--- src/c/include/recordio.h
++++ src/c/include/recordio.h
+@@ -70,7 +70,7 @@ void close_buffer_iarchive(struct iarchive **ia);
+ char *get_buffer(struct oarchive *);
+ int get_buffer_len(struct oarchive *);
+
+-int64_t htonll(int64_t v);
++int64_t zoo_htonll(int64_t v);
+
+ #ifdef __cplusplus
+ }
+diff --git src/c/src/recordio.c src/c/src/recordio.c
+index 968fdc4..07217c1 100644
+--- src/c/src/recordio.c
++++ src/c/src/recordio.c
+@@ -80,7 +80,7 @@ int oa_serialize_int(struct oarchive *oa, const char *tag, const int32_t *d)
+ priv->off+=sizeof(i);
+ return 0;
+ }
+-int64_t htonll(int64_t v)
++int64_t zoo_htonll(int64_t v)
+ {
+ int i = 0;
+ char *s = (char *)&v;
+@@ -98,7 +98,7 @@ int64_t htonll(int64_t v)
+
+ int oa_serialize_long(struct oarchive *oa, const char *tag, const int64_t *d)
+ {
+- const int64_t i = htonll(*d);
++ const int64_t i = zoo_htonll(*d);
+ struct buff_struct *priv = oa->priv;
+ if ((priv->len - priv->off) < sizeof(i)) {
+ int rc = resize_buffer(priv, priv->len + sizeof(i));
+@@ -207,7 +207,7 @@ int ia_deserialize_long(struct iarchive *ia, const char *tag, int64_t *count)
+ }
+ memcpy(count, priv->buffer+priv->off, sizeof(*count));
+ priv->off+=sizeof(*count);
+- v = htonll(*count); // htonll and ntohll do the same
++ v = zoo_htonll(*count); // htonll and ntohll do the same
+ *count = v;
+ return 0;
+ }
+diff --git src/c/src/zookeeper.c src/c/src/zookeeper.c
+index ca81a1b..8225094 100644
+--- src/c/src/zookeeper.c
++++ src/c/src/zookeeper.c
+@@ -1798,7 +1798,7 @@ static int serialize_prime_connect(struct connect_req *req, char* buffer){
+ memcpy(buffer + offset, &req->protocolVersion, sizeof(req->protocolVersion));
+ offset = offset + sizeof(req->protocolVersion);
+
+- req->lastZxidSeen = htonll(req->lastZxidSeen);
++ req->lastZxidSeen = zoo_htonll(req->lastZxidSeen);
+ memcpy(buffer + offset, &req->lastZxidSeen, sizeof(req->lastZxidSeen));
+ offset = offset + sizeof(req->lastZxidSeen);
+
+@@ -1806,7 +1806,7 @@ static int serialize_prime_connect(struct connect_req *req, char* buffer){
+ memcpy(buffer + offset, &req->timeOut, sizeof(req->timeOut));
+ offset = offset + sizeof(req->timeOut);
+
+- req->sessionId = htonll(req->sessionId);
++ req->sessionId = zoo_htonll(req->sessionId);
+ memcpy(buffer + offset, &req->sessionId, sizeof(req->sessionId));
+ offset = offset + sizeof(req->sessionId);
+
+@@ -1843,7 +1843,7 @@ static int deserialize_prime_response(struct prime_struct *req, char* buffer)
+ memcpy(&req->sessionId, buffer + offset, sizeof(req->sessionId));
+ offset = offset + sizeof(req->sessionId);
+
+- req->sessionId = htonll(req->sessionId);
++ req->sessionId = zoo_htonll(req->sessionId);
+ memcpy(&req->passwd_len, buffer + offset, sizeof(req->passwd_len));
+ offset = offset + sizeof(req->passwd_len);
+
+diff --git src/c/tests/ZKMocks.cc src/c/tests/ZKMocks.cc
+index 263f3ce..1310ab9 100644
+--- src/c/tests/ZKMocks.cc
++++ src/c/tests/ZKMocks.cc
+@@ -41,7 +41,7 @@ HandshakeRequest* HandshakeRequest::parse(const std::string& buf) {
+ int offset=sizeof(req->protocolVersion);
+
+ memcpy(&req->lastZxidSeen,buf.data()+offset,sizeof(req->lastZxidSeen));
+- req->lastZxidSeen = htonll(req->lastZxidSeen);
++ req->lastZxidSeen = zoo_htonll(req->lastZxidSeen);
+ offset+=sizeof(req->lastZxidSeen);
+
+ memcpy(&req->timeOut,buf.data()+offset,sizeof(req->timeOut));
+@@ -49,7 +49,7 @@ HandshakeRequest* HandshakeRequest::parse(const std::string& buf) {
+ offset+=sizeof(req->timeOut);
+
+ memcpy(&req->sessionId,buf.data()+offset,sizeof(req->sessionId));
+- req->sessionId = htonll(req->sessionId);
++ req->sessionId = zoo_htonll(req->sessionId);
+ offset+=sizeof(req->sessionId);
+
+ memcpy(&req->passwd_len,buf.data()+offset,sizeof(req->passwd_len));
+@@ -339,7 +339,7 @@ string HandshakeResponse::toString() const {
+ buf.append((char*)&tmp,sizeof(tmp));
+ tmp=htonl(timeOut);
+ buf.append((char*)&tmp,sizeof(tmp));
+- int64_t tmp64=htonll(sessionId);
++ int64_t tmp64=zoo_htonll(sessionId);
+ buf.append((char*)&tmp64,sizeof(sessionId));
+ tmp=htonl(passwd_len);
+ buf.append((char*)&tmp,sizeof(tmp));
</ins></span></pre>
</div>
</div>
</body>
</html>