Ticket #39122: zmq.2.patch

File zmq.2.patch, 2.3 KB (added by merijn (Merijn Verstraaten), 11 years ago)

Patch for Portfile + patch

  • devel/zmq/Portfile

    diff -Nur ports/devel/zmq/Portfile ports-new/devel/zmq/Portfile
    old new  
    3737depends_build       port:libtool
    3838build.args          LIBTOOL=${prefix}/bin/glibtool
    3939
     40# Work-around from upstream, delete debug prints in tests
     41if {[vercmp ${os.version} 10.9.0] < 0} {
     42    patchfiles          patch-tests-test_disconnect_inproc.cpp.diff
     43}
     44
    4045variant pgm description {build with PGM extension} {
    4146    configure.args-append   --with-pgm
    4247}
  • devel/zmq/files/patch-tests-test_disconnect_inproc.cpp.diff

    diff -Nur ports/devel/zmq/files/patch-tests-test_disconnect_inproc.cpp.diff ports-new/devel/zmq/files/patch-tests-test_disconnect_inproc.cpp.diff
    old new  
     1--- tests/test_disconnect_inproc.cpp    2013-05-02 03:18:44.000000000 -0600
     2+++ tests/test_disconnect_inproc.cpp    2013-05-18 10:45:13.000000000 -0600
     3@@ -40,16 +40,14 @@
     4                 zmq_msg_t msg;
     5                 zmq_msg_init (&msg);
     6                 zmq_msg_recv (&msg, pubSocket, 0);
     7-                int msgSize = zmq_msg_size(&msg);
     8                 char* buffer = (char*)zmq_msg_data(&msg);
     9 
     10                 if (buffer[0] == 0) {
     11                     assert(isSubscribed);
     12-                    printf("unsubscribing from '%s'\n", strndup(buffer + 1, msgSize - 1));
     13                     isSubscribed = false;
     14                 } else {
     15                     assert(!isSubscribed);
     16-                    printf("subscribing on '%s'\n", strndup(buffer + 1, msgSize - 1));
     17                     isSubscribed = true;
     18                 }
     19 
     20@@ -66,11 +64,6 @@
     21                 zmq_msg_t msg;
     22                 zmq_msg_init (&msg);
     23                 zmq_msg_recv (&msg, subSocket, 0);
     24-                int msgSize = zmq_msg_size(&msg);
     25-                char* buffer = (char*)zmq_msg_data(&msg);
     26-       
     27-                printf("received on subscriber '%s'\n", strndup(buffer, msgSize));
     28-       
     29                 zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size);
     30                 zmq_msg_close (&msg);
     31