diff options
| author | joerg <joerg@pkgsrc.org> | 2016-12-15 23:50:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-12-15 23:50:01 +0000 |
| commit | 18dd2eb3da30f31559faca00ef1002f9799c0cdd (patch) | |
| tree | b819392f1058f1ab6b7436c00606f23358616536 | |
| parent | c63c6a2e84c1b4d06c5994cfd9f6f4e2e3bee851 (diff) | |
| download | pkgsrc-18dd2eb3da30f31559faca00ef1002f9799c0cdd.tar.gz | |
There is no order relation for pointers vs 0. Guess the expected
behavior and bump revision.
| -rw-r--r-- | devel/libthrift/Makefile | 4 | ||||
| -rw-r--r-- | devel/libthrift/distinfo | 3 | ||||
| -rw-r--r-- | devel/libthrift/patches/patch-lib_cpp_src_transport_TFileTransport.cpp | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/devel/libthrift/Makefile b/devel/libthrift/Makefile index 96f4f0eb9ee..6d156f8865e 100644 --- a/devel/libthrift/Makefile +++ b/devel/libthrift/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2016/12/04 05:17:24 ryoon Exp $ +# $NetBSD: Makefile,v 1.54 2016/12/15 23:50:01 joerg Exp $ DISTNAME= thrift-${THRIFT_VERSION} PKGNAME= libthrift-${THRIFT_VERSION} -PKGREVISION= 35 +PKGREVISION= 36 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE:=thrift/${THRIFT_VERSION}/} EXTRACT_SUFX= .tar.gz diff --git a/devel/libthrift/distinfo b/devel/libthrift/distinfo index 4305428fe02..d719d3d6d8c 100644 --- a/devel/libthrift/distinfo +++ b/devel/libthrift/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2016/05/30 16:09:07 taca Exp $ +$NetBSD: distinfo,v 1.15 2016/12/15 23:50:01 joerg Exp $ SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052 @@ -19,6 +19,7 @@ SHA1 (patch-lib_cpp_src_async_TEvhttpServer.cpp) = 84558ef95935914cccb74405031bc SHA1 (patch-lib_cpp_src_concurrency_FunctionRunner.h) = 8e15b54872ad0bb59276d25d7200517382a9fcb4 SHA1 (patch-lib_cpp_src_concurrency_ThreadManager.h) = e97795f632ed98c19172fa25ff6a83a0c9580ff2 SHA1 (patch-lib_cpp_src_server_TNonblockingServer.cpp) = 1f94bcad637279b151b8c0830854c5fc72919e68 +SHA1 (patch-lib_cpp_src_transport_TFileTransport.cpp) = e3d68d0287388dfd81c94555c3437fa8aafcea06 SHA1 (patch-lib_cpp_src_transport_TSSLSocket.cpp) = 5b0ee2a0d276affc4ead52492e0100f4c0665550 SHA1 (patch-lib_cpp_src_transport_TServerSocket.cpp) = dc54a0991f5918de04da73f184c551d7a2bd57ed SHA1 (patch-lib_cpp_test_Benchmark.cpp) = 65a3a873b33f7290551c535b4ef8c9a109aae3e1 diff --git a/devel/libthrift/patches/patch-lib_cpp_src_transport_TFileTransport.cpp b/devel/libthrift/patches/patch-lib_cpp_src_transport_TFileTransport.cpp new file mode 100644 index 00000000000..15507157b10 --- /dev/null +++ b/devel/libthrift/patches/patch-lib_cpp_src_transport_TFileTransport.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-lib_cpp_src_transport_TFileTransport.cpp,v 1.1 2016/12/15 23:50:01 joerg Exp $ + +Don't compare pointers to 0, there is no order relation. + +--- lib/cpp/src/transport/TFileTransport.cpp.orig 2016-12-13 21:29:23.196467473 +0000 ++++ lib/cpp/src/transport/TFileTransport.cpp +@@ -136,7 +136,7 @@ void TFileTransport::resetOutputFile(int + + TFileTransport::~TFileTransport() { + // flush the buffer if a writer thread is active +- if (writerThreadId_ > 0) { ++ if (writerThreadId_) { + // set state to closing + closing_ = true; + +@@ -521,7 +521,7 @@ void TFileTransport::writerThread() { + + void TFileTransport::flush() { + // file must be open for writing for any flushing to take place +- if (writerThreadId_ <= 0) { ++ if (writerThreadId_ == 0) { + return; + } + // wait for flush to take place |