diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2017-12-21 21:01:37 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2017-12-21 21:01:37 +0000 |
commit | b2c3984a64cb2aa68a519ef87312d9448c975cdc (patch) | |
tree | 8d5d9f934377864f50b60ea1ae09a2ae9ef59d43 | |
parent | net-mgmt/nrpe3: Fix build with LibreSSL (diff) |
Fix build of net-p2p/retroshare with recent versions of clang.
Approved by: portmgr blanket
Submitted by: Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>
PR: 216637
MFH: 2017Q4
Notes
Notes:
svn path=/head/; revision=456947
-rw-r--r-- | net-p2p/retroshare/Makefile | 6 | ||||
-rw-r--r-- | net-p2p/retroshare/files/patch-libbitdht_src_util_bdthreads.cc | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile index 10187692828b..8ad661bd1faf 100644 --- a/net-p2p/retroshare/Makefile +++ b/net-p2p/retroshare/Makefile @@ -4,7 +4,7 @@ PORTNAME= retroshare PORTVERSION= 0.6.1 DISTVERSIONPREFIX= v -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p MAINTAINER= peter@netkey.at @@ -24,10 +24,6 @@ LIB_DEPENDS= libsqlcipher.so:databases/sqlcipher \ libcurl.so:ftp/curl \ libmicrohttpd.so:www/libmicrohttpd -BROKEN_aarch64= fails to compile due to clang 4.0 regression: util/bdthreads.cc:132:10: ordered comparison between pointer and zero -BROKEN_armv6= fails to compile due to clang 4.0 regression: util/bdthreads.cc:132:10: ordered comparison between pointer and zero -BROKEN_armv7= fails to compile due to clang 4.0 regression: util/bdthreads.cc:132:10: ordered comparison between pointer and zero - USES= compiler:features desktop-file-utils dos2unix pkgconfig qmake ssl USE_GNOME= glib20 libxml2 libxslt USE_GL= gl diff --git a/net-p2p/retroshare/files/patch-libbitdht_src_util_bdthreads.cc b/net-p2p/retroshare/files/patch-libbitdht_src_util_bdthreads.cc new file mode 100644 index 000000000000..3f6cff3903ad --- /dev/null +++ b/net-p2p/retroshare/files/patch-libbitdht_src_util_bdthreads.cc @@ -0,0 +1,11 @@ +--- libbitdht/src/util/bdthreads.cc.orig 2016-08-31 11:24:02 UTC ++++ libbitdht/src/util/bdthreads.cc +@@ -129,7 +129,7 @@ void bdThread::join() /* waits for the the mTid thread + #if defined(_WIN32) || defined(__MINGW32__) + /* Its a struct in Windows compile and the member .p ist checked in the pthreads library */ + #else +- if(mTid > 0) ++ if(mTid != NULL) + #endif + pthread_join(mTid, NULL); + |