From ef70e5b7789dc096bcb0f1df6b9d7853de9b3dca Mon Sep 17 00:00:00 2001
From: Martin Kinkelin <noone@nowhere.com>
Date: Sat, 15 Feb 2020 02:03:03 +0100
Subject: [PATCH] LDC: Upgrade to v1.20.0

---
 packages/ldc/build.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh
index 4a7320fe9..f761213d8 100644
--- a/packages/ldc/build.sh
+++ b/packages/ldc/build.sh
@@ -4,21 +4,21 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ldc-developers/ldc
 TERMUX_PKG_DESCRIPTION="D programming language compiler, built with LLVM"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=()
-TERMUX_PKG_VERSION+=(1.19.0)
+TERMUX_PKG_VERSION+=(1.20.0)
 TERMUX_PKG_VERSION+=(9.0.1)   # LLVM version
-TERMUX_PKG_VERSION+=(2.089.1) # TOOLS version
-TERMUX_PKG_VERSION+=(1.18.0)  # DUB version
+TERMUX_PKG_VERSION+=(2.090.1) # TOOLS version
+TERMUX_PKG_VERSION+=(1.19.0)  # DUB version
 
 TERMUX_PKG_SRCURL=(https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc-${TERMUX_PKG_VERSION}-src.tar.gz
 		   https://github.com/ldc-developers/llvm-project/releases/download/ldc-v${TERMUX_PKG_VERSION[1]}/llvm-${TERMUX_PKG_VERSION[1]}.src.tar.xz
 		   https://github.com/dlang/tools/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz
 		   https://github.com/dlang/dub/archive/v${TERMUX_PKG_VERSION[3]}.tar.gz
 		   https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc2-${TERMUX_PKG_VERSION}-linux-x86_64.tar.xz)
-TERMUX_PKG_SHA256=(c7056c10ab841762b84ae9ea6ab083b131924d683e1e0d8a18aa496c537213ae
+TERMUX_PKG_SHA256=(49c9fdfe3a51c978385aae94f2e102f306102f6282215638f2ae3fb9ea8d3ab9
 		   fb1aa89d334487a23036978e266c9e47e00941b40c749561a688efe83961e051
-		   b3d7f0d2e4ce6646a5ea5afa49b6b96271e2b23b18676fe91dfd44e8ee59cfa9
-		   5ea118388217ad9afe7ccd6a486c0139c39a45e464de662fecfa142a408c1880
-		   30f8b810ab12df0885262e0b1d83566399d5cf59fecec747982e2b4e45cecf90)
+		   5b2db582632ec882188b70dc84da0156e16b21d346c9e46f6d21c663024efa35
+		   84dc77f517ca1f115e05e25e8a8cdbcacbf31df281217ebac31dc974560a4ffc
+		   ab2100228b9396ff1098006f7692d5638f4ebeb07890767499207c8aaf62ff09)
 TERMUX_PKG_DEPENDS="clang, libc++, zlib"
 TERMUX_PKG_NO_STATICSPLIT=true
 TERMUX_PKG_HOSTBUILD=true
@@ -73,18 +73,20 @@ termux_step_host_build() {
 termux_step_pre_configure() {
 	LDFLAGS+=" -lc++_shared"
 
+	# Don't build compiler-rt sanitizers:
+	# * 64-bit targets: libclang_rt.hwasan-*-android.so fails to link
+	# * 32-bit ARM: compile errors for interception library
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+
 	local LLVM_TARGET_ARCH
 	if [ $TERMUX_ARCH = "arm" ]; then
 		LLVM_TARGET_ARCH=ARM
 	elif [ $TERMUX_ARCH = "aarch64" ]; then
 		LLVM_TARGET_ARCH=AArch64
-		# libclang_rt.hwasan-*-android.so fails to link for AArch64 and x86_64
-		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCOMPILER_RT_BUILD_SANITIZERS=OFF"
 	elif [ $TERMUX_ARCH = "i686" ]; then
 		LLVM_TARGET_ARCH=X86
 	elif [ $TERMUX_ARCH = "x86_64" ]; then
 		LLVM_TARGET_ARCH=X86
-		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCOMPILER_RT_BUILD_SANITIZERS=OFF"
 	else
 		termux_error_exit "Invalid arch: $TERMUX_ARCH"
 	fi