From 6b3755fd1a1b60d49d1faa1aa2baf9f431c2fde4 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Fri, 6 Dec 2024 20:38:41 +0000
Subject: [PATCH] chore(main/openethereum): replace RUSTFLAGS

---
 packages/openethereum/build.sh | 42 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/openethereum/build.sh b/packages/openethereum/build.sh
index 4ada7c3b2d..7ef599cba7 100644
--- a/packages/openethereum/build.sh
+++ b/packages/openethereum/build.sh
@@ -3,23 +3,39 @@ TERMUX_PKG_DESCRIPTION="Lightweight Ethereum Client"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.3.5"
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://github.com/openethereum/openethereum/archive/v${TERMUX_PKG_VERSION}.zip
-TERMUX_PKG_SHA256=fb4a3c9ac1e5ba2803098b3ba1c114a2a9a5397fed3cd65c4c966525cb6b075d
+TERMUX_PKG_REVISION=3
+TERMUX_PKG_SRCURL=https://github.com/openethereum/openethereum/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=e0e08f61b1c060d34c6a4dcec1eda3d4dae194fc9748e8051efbf12d1c884e14
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_configure() {
 	termux_setup_cmake
+	termux_setup_rust
+	cargo clean
+	export NDK_HOME=$NDK
+	local env_host=$(printf $CARGO_TARGET_NAME | tr a-z A-Z | sed s/-/_/g)
+	export CARGO_TARGET_${env_host}_RUSTFLAGS+=" -C link-arg=-lc++_shared"
+
+	: "${CARGO_HOME:=$HOME/.cargo}"
+	export CARGO_HOME
 
 	CXXFLAGS+=" --target=$CCTERMUX_HOST_PLATFORM"
 	CFLAGS+=" --target=$CCTERMUX_HOST_PLATFORM"
+	CMAKE_SYSTEM_PROCESSOR="$TERMUX_ARCH"
+
 	if [ $TERMUX_ARCH = "arm" ]; then
 		CFLAGS="${CFLAGS/-mthumb/}"
+		export CFLAGS_${CARGO_TARGET_NAME//-/_}="${CFLAGS}"
 		CMAKE_SYSTEM_PROCESSOR="armv7-a"
-	else
-		CMAKE_SYSTEM_PROCESSOR=$TERMUX_ARCH
+	elif [ "$TERMUX_ARCH" = "x86_64" ]; then
+		local libdir=target/$CARGO_TARGET_NAME/release/deps
+		mkdir -p $libdir
+		pushd $libdir
+		export CARGO_TARGET_${env_host}_RUSTFLAGS+=" -C link-arg=$($CC -print-libgcc-file-name)"
+		echo "INPUT(-l:libunwind.a)" > libgcc.so
+		popd
 	fi
 
 	cat <<- EOF > $TERMUX_COMMON_CACHEDIR/defaultcache.cmake
@@ -48,22 +64,6 @@ termux_step_configure() {
 
 	export CMAKE=$TERMUX_PKG_BUILDER_DIR/cmake_mod.sh
 	export TERMUX_COMMON_CACHEDIR
-
-	termux_setup_rust
-	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
-		RUSTFLAGS+=" -C link-arg=$($CC -print-libgcc-file-name)"
-		echo "INPUT(-l:libunwind.a)" > libgcc.so
-		popd
-	fi
 }
 
 termux_step_make() {