openethereum: Re-enable and update to 3.3.3

packages/openethereum/build.sh

@@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://openethereum.github.io
 TERMUX_PKG_DESCRIPTION="Lightweight Ethereum Client"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=3.3.0-rc.10
+TERMUX_PKG_VERSION=3.3.3
 TERMUX_PKG_SRCURL=https://github.com/openethereum/openethereum/archive/v${TERMUX_PKG_VERSION}.zip
-TERMUX_PKG_SHA256=1d3715c291757aaaf422c2739f6f67776148d3219976a40b6123243aa7c033a5
+TERMUX_PKG_SHA256=e62f2f825ca895a12b18b07af6ff8472417516a3644c0ca6401d88e741332b7e
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_RUST_VERSION=1.45
 
 termux_step_configure() {
 	termux_setup_cmake
@@ -52,9 +52,24 @@ termux_step_configure() {
 	cargo clean
 	export NDK_HOME=$NDK
 	RUSTFLAGS+=" -C link-args=-lc++"
+	: "${CARGO_HOME:=$HOME/.cargo}"
+	export CARGO_HOME
+
+	if [ "$TERMUX_ARCH" = "x86_64" ]; then
+		local libdir=target/$CARGO_TARGET_NAME/release/deps
+		mkdir -p $libdir
+		pushd $libdir
+		local libgcc="$($CC -print-libgcc-file-name)"
+		echo "INPUT($libgcc -l:libunwind.a)" > libgcc.so
+		popd
+	fi
 }
 
 termux_step_make() {
+	cargo fetch --target $CARGO_TARGET_NAME
+	patch --silent -p1 \
+		-d $CARGO_HOME/registry/src/github.com-*/parity-rocksdb-sys-0.5.6/rocksdb \
+		< $TERMUX_PKG_BUILDER_DIR/parity-rocksdb-sys-0.5.6-mutex.diff
 	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release --features final
 	for applet in evmbin ethstore-cli ethkey-cli; do
 		cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release -p $applet

packages/openethereum/parity-rocksdb-sys-0.5.6-mutex.diff

@@ -0,0 +1,25 @@
+https://github.com/cockroachdb/rocksdb/commit/92572072dc46c1c35191ca529f860fe219007fd0
+
+From 139500df49ff6009d5098fa8e2cc0dc4e97e7c5a Mon Sep 17 00:00:00 2001
+From: Raphael 'kena' Poss <knz@thaumogen.net>
+Date: Wed, 1 Apr 2020 10:46:13 +0200
+Subject: [PATCH] util/channel.h: remove an invalid const specifier
+
+This error was found by Clang 10.
+---
+ util/channel.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/channel.h b/util/channel.h
+index 0225482c00c..2eaf02d0ccd 100644
+--- a/util/channel.h
++++ b/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();
+   }