[124063] trunk/dports/sysutils/gearmand

[ryandesign at macports.org]

Revision: 124063
          https://trac.macports.org/changeset/124063
Author:   ryandesign at macports.org
Date:     2014-08-17 19:49:24 -0700 (Sun, 17 Aug 2014)
Log Message:
-----------
gearmand: fix build when htonll/ntohll are already defined

Modified Paths:
--------------
    trunk/dports/sysutils/gearmand/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/gearmand/files/
    trunk/dports/sysutils/gearmand/files/patch-libgearman-byteorder.cc.diff

Modified: trunk/dports/sysutils/gearmand/Portfile
===================================================================
--- trunk/dports/sysutils/gearmand/Portfile	2014-08-18 02:26:02 UTC (rev 124062)
+++ trunk/dports/sysutils/gearmand/Portfile	2014-08-18 02:49:24 UTC (rev 124063)
@@ -36,6 +36,8 @@
 depends_lib         port:boost \
                     port:libevent
 
+patchfiles-append   patch-libgearman-byteorder.cc.diff
+
 configure.args      --disable-silent-rules \
                     --disable-libdrizzle \
                     --disable-libpq \
@@ -73,6 +75,9 @@
             reinplace "s:tr1/::" ${worksrcpath}/libgearman-1.0/gearman.h
         }
     }
+    if {${os.major} >= 14} {
+        configure.cxxflags-append -DHAVE_HTONLL
+    }
 }
 
 variant dtrace description {Enable DTrace probes} {

Added: trunk/dports/sysutils/gearmand/files/patch-libgearman-byteorder.cc.diff
===================================================================
--- trunk/dports/sysutils/gearmand/files/patch-libgearman-byteorder.cc.diff	                        (rev 0)
+++ trunk/dports/sysutils/gearmand/files/patch-libgearman-byteorder.cc.diff	2014-08-18 02:49:24 UTC (rev 124063)
@@ -0,0 +1,17 @@
+--- libgearman/byteorder.cc.orig	2013-07-14 03:20:42.000000000 -0500
++++ libgearman/byteorder.cc	2014-08-17 21:39:53.000000000 -0500
+@@ -65,6 +65,8 @@
+ }
+ #endif
+ 
++#ifndef HAVE_HTONLL
++
+ uint64_t ntohll(uint64_t value)
+ {
+   return swap64(value);
+@@ -74,3 +76,5 @@
+ {
+   return swap64(value);
+ }
++
++#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140817/7b712fa4/attachment.html>