X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/99109276670560a6943d648c36c33121664b1724..6bd4780d205ef51f667f3b697e75d9696d79e6e2:/packages/ldc/build.sh?ds=sidebyside

diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh
index fdf0f43b..a38710dd 100644
--- a/packages/ldc/build.sh
+++ b/packages/ldc/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/ldc-developers/ldc
 TERMUX_PKG_DESCRIPTION="D programming language compiler, built with LLVM"
-_PKG_MAJOR_VERSION=1.5
+_PKG_MAJOR_VERSION=1.7
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
 TERMUX_PKG_SRCURL=https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc-${TERMUX_PKG_VERSION}-src.tar.gz
-TERMUX_PKG_SHA256=03659a4b9cafff0cf8d537469dd15579f097c7748a342ea2a5770fa0edd3a084
+TERMUX_PKG_SHA256=7cd46140ca3e4ca0d52c352e5b694d4d5336898ed4f02c3e18e0eafd69dd18bd
 TERMUX_PKG_DEPENDS="clang"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_BLACKLISTED_ARCHES="aarch64,i686,x86_64"
@@ -21,34 +21,34 @@ TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_MAINTAINER="Joakim @joakim-noah"
 
 termux_step_post_extract_package () {
-	local LLVM_SRC_VERSION=5.0.0-2
+	local LLVM_SRC_VERSION=5.0.1
 	termux_download \
 		https://github.com/ldc-developers/llvm/releases/download/ldc-v${LLVM_SRC_VERSION}/llvm-${LLVM_SRC_VERSION}.src.tar.xz \
 		$TERMUX_PKG_CACHEDIR/llvm-${LLVM_SRC_VERSION}.src.tar.xz \
-		7bb7621ecb05ad9a9a2165bae69c0548c179fdaf7e12e8458897c5e8bc1a6dae
+		aa54870d2d4ab0066f8e26fe6880ec037565b0350d67bef55d0ac2018bfb1a45
 
 	tar xf $TERMUX_PKG_CACHEDIR/llvm-${LLVM_SRC_VERSION}.src.tar.xz
 	mv llvm-${LLVM_SRC_VERSION}.src llvm
 
-	DMD_COMPILER_VERSION=2.076.1
+	DMD_COMPILER_VERSION=2.078.0
 	termux_download \
 		http://downloads.dlang.org/releases/2.x/${DMD_COMPILER_VERSION}/dmd.${DMD_COMPILER_VERSION}.linux.tar.xz \
 		$TERMUX_PKG_CACHEDIR/dmd.${DMD_COMPILER_VERSION}.linux.tar.xz \
-		1d0b8fb6aadc80f6c5dfe7acf46fc17d2b3de24a0bf46e947352094bb21fef04
+		651a6bf34bd23b893b8cb38a5b7783275145c047eef83c526730ba9394123c64
 
 	termux_download \
 		https://github.com/dlang/tools/archive/v${DMD_COMPILER_VERSION}.tar.gz \
 		$TERMUX_PKG_CACHEDIR/tools-v${DMD_COMPILER_VERSION}.tar.gz \
-		cf42d4e5f9ceb5acfb5bd3000dd9c1ed7120b136f252b33b07fb026f36970e77
+		5d3de1524bb1a024649a065e2567893c88cc4dba17ae9bd6f576e11bc91533ec
 
 	tar xf $TERMUX_PKG_CACHEDIR/tools-v${DMD_COMPILER_VERSION}.tar.gz
 	mv tools-${DMD_COMPILER_VERSION} rdmd
 
-	local DUB_VERSION=1.5.0
+	local DUB_VERSION=1.7.0
 	termux_download \
 		https://github.com/dlang/dub/archive/v${DUB_VERSION}.tar.gz \
 		$TERMUX_PKG_CACHEDIR/dub-v${DUB_VERSION}.tar.gz \
-		3509f959cc5b34e44adaae586b62ded387ac10031f6c1aaf1cfbb4aae5af37dd
+		5c4875cf4ced113d35f1da949524a2b366dff93049dffe98da95171bed6cd069
 
 	tar xf $TERMUX_PKG_CACHEDIR/dub-v${DUB_VERSION}.tar.gz
 	mv dub-${DUB_VERSION} dub
@@ -77,7 +77,7 @@ termux_step_host_build () {
 	termux_setup_ninja
 	cmake -GNinja $TERMUX_PKG_SRCDIR/llvm \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DLLVM_TARGETS_TO_BUILD=ARM \
+		-DLLVM_TARGETS_TO_BUILD="ARM;X86" \
 		-DLLVM_DEFAULT_TARGET_TRIPLE=armv7-none-linux-android \
 		-DLLVM_BUILD_TOOLS=OFF \
 		-DLLVM_BUILD_UTILS=OFF
@@ -89,7 +89,7 @@ termux_step_host_build () {
 
 	cmake -GNinja $TERMUX_PKG_SRCDIR \
 		-DD_FLAGS="-w;-mcpu=cortex-a8" \
-		-DRT_CFLAGS="-march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb -Oz -I$TERMUX_PREFIX/include" \
+		-DRT_CFLAGS="-march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb -Os -I$TERMUX_PREFIX/include" \
 		-DLLVM_CONFIG="$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-config"
 	ninja -j $TERMUX_MAKE_PROCESSES druntime-ldc phobos2-ldc \
 		druntime-ldc-debug phobos2-ldc-debug ldmd2
@@ -123,11 +123,7 @@ termux_step_post_configure () {
 	mv llvm-config llvm/bin
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DLLVM_CONFIG=$TERMUX_PKG_BUILDDIR/llvm/bin/llvm-config"
 	export DMD="$TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/bin/ldmd2"
-
 	termux_step_configure_cmake
-
-	cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/ddmd/id.d $TERMUX_PKG_BUILDDIR/ddmd
-	cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/ddmd/id.h $TERMUX_PKG_BUILDDIR/ddmd
 }
 
 termux_step_make () {
@@ -142,7 +138,7 @@ termux_step_make () {
 	fi
 
 	# Build the rdmd scripting wrapper and the dub package manager
-	D_FLAGS="-w -de -O -inline -release -mcpu=cortex-a8"
+	D_FLAGS="-w -de -O -mcpu=cortex-a8"
 	$DMD $D_FLAGS -c $TERMUX_PKG_SRCDIR/rdmd/rdmd.d -of=$TERMUX_PKG_BUILDDIR/bin/rdmd.o
 	D_LDFLAGS="-fuse-ld=bfd -L${TERMUX_PKG_HOSTBUILD_DIR}/ldc-bootstrap/lib -lphobos2-ldc -ldruntime-ldc -Wl,--gc-sections -ldl -lm -Wl,--fix-cortex-a8 -fPIE -pie -Wl,-z,nocopyreloc ${LDFLAGS}"
 	$CC $TERMUX_PKG_BUILDDIR/bin/rdmd.o $D_LDFLAGS -o $TERMUX_PKG_BUILDDIR/bin/rdmd
@@ -158,6 +154,7 @@ termux_step_make_install () {
 	cp $TERMUX_PKG_HOSTBUILD_DIR/ldc-bootstrap/lib/lib{druntime,phobos2}*.a $TERMUX_PREFIX/lib
 	sed -i "/runtime\/druntime\/src/d" bin/ldc2.conf
 	sed -i "/runtime\/profile-rt\/d/d" bin/ldc2.conf
+	sed -i "/runtime\/jit-rt\/d/d" bin/ldc2.conf
 	sed -i "s|$TERMUX_PKG_SRCDIR/runtime/phobos|%%ldcbinarypath%%/../include/d|" bin/ldc2.conf
 	sed "s|$TERMUX_PKG_BUILDDIR/lib|%%ldcbinarypath%%/../lib|" bin/ldc2.conf > $TERMUX_PREFIX/etc/ldc2.conf