summaryrefslogtreecommitdiff
path: root/net-p2p
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2020-11-20 18:06:08 +0000
committerAlex Dupre <ale@FreeBSD.org>2020-11-20 18:06:08 +0000
commitba7fec74015f9bd40279f7d6396352d6bde94d40 (patch)
tree69ba11f06b96b05b749b2e0beb66cf2eb20417f0 /net-p2p
parentx11-toolkits/swt: fix patch to correctly detect cpu arch (diff)
Fix build with clang 10 and FreeBSD 11.
Remove unused clang build dependency. PR: 251271 Submitted by: mikael
Notes
Notes: svn path=/head/; revision=555775
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/openethereum/Makefile7
-rw-r--r--net-p2p/openethereum/files/patch-cargo-crates_parity-rocksdb-sys-0.5.6_rocksdb_util_channel.h11
2 files changed, 13 insertions, 5 deletions
diff --git a/net-p2p/openethereum/Makefile b/net-p2p/openethereum/Makefile
index 16c122ac17e6..f01ff42c0b1e 100644
--- a/net-p2p/openethereum/Makefile
+++ b/net-p2p/openethereum/Makefile
@@ -11,10 +11,7 @@ COMMENT= Fast and feature-rich multi-network Ethereum client
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_i386= fails to build
-BROKEN_FreeBSD_11= fails to build
-
-BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
+BROKEN_i386= fails to build
USES= cargo
@@ -25,7 +22,7 @@ PLIST_FILES= bin/${PORTNAME}
CARGO_FEATURES= final
CARGO_TEST= yes
-MAKE_ENV+= LLVM_CONFIG_PATH="${LOCALBASE}/bin/llvm-config90"
+RUSTFLAGS+= -C link-arg=-fuse-ld=lld
.include "${.CURDIR}/Makefile.crates"
diff --git a/net-p2p/openethereum/files/patch-cargo-crates_parity-rocksdb-sys-0.5.6_rocksdb_util_channel.h b/net-p2p/openethereum/files/patch-cargo-crates_parity-rocksdb-sys-0.5.6_rocksdb_util_channel.h
new file mode 100644
index 000000000000..7a837094ad1c
--- /dev/null
+++ b/net-p2p/openethereum/files/patch-cargo-crates_parity-rocksdb-sys-0.5.6_rocksdb_util_channel.h
@@ -0,0 +1,11 @@
+--- cargo-crates/parity-rocksdb-sys-0.5.6/rocksdb/util/channel.h.orig 2020-11-20 16:25:54 UTC
++++ cargo-crates/parity-rocksdb-sys-0.5.6/rocksdb/util/channel.h
+@@ -31,7 +31,7 @@ class channel {
+ return buffer_.empty() && eof_;
+ }
+
+- size_t size() const {
++ size_t size() {
+ std::lock_guard<std::mutex> lk(lock_);
+ return buffer_.size();
+ }