From 48de37acfe3b342b0fca3610d8c4236b53603c3e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 7 Apr 2022 08:52:28 +0900 Subject: [PATCH] ldc: Set `DT_RUNPATH` for dub (and other tools) --- packages/ldc/build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index 13c111cca..7ac667555 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_DESCRIPTION="D programming language compiler, built with LLVM" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=() -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_VERSION+=(1.27.1) TERMUX_PKG_VERSION+=(12.0.1) # LLVM version TERMUX_PKG_VERSION+=(2.097.1) # TOOLS version @@ -26,7 +26,8 @@ TERMUX_PKG_SHA256=(93c8f500b39823dcdabbd73e1bcb487a1b93cb9a60144b0de1c81ab50200e 1e458599306bdfbe498418363c0e375bd75e9ae99676033ef3035f43cbd43dfd 48d68e0747dc17b9b0d2799a2fffdc5ddaf986c649283c784830f19c4c82830c 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c) -TERMUX_PKG_DEPENDS="binutils, clang, libc++, zlib" +# dub dlopen()s libcurl.so: +TERMUX_PKG_DEPENDS="binutils, clang, libc++, libcurl, zlib" TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_FORCE_CMAKE=true @@ -200,6 +201,9 @@ termux_step_make() { export DFLAGS="$DFLAGS -linker=bfd -L-L$TERMUX_PKG_BUILDDIR/ldc-build-runtime.tmp/lib" if [ $TERMUX_ARCH = arm ]; then export DFLAGS="$DFLAGS -L--fix-cortex-a8"; fi + # https://github.com/termux/termux-packages/issues/7188 + DFLAGS+=" -L-rpath=$TERMUX_PREFIX/lib" + cd $TERMUX_PKG_SRCDIR/dlang-tools $DMD -w -de -dip1000 rdmd.d -of=$TERMUX_PKG_BUILDDIR/bin/rdmd $DMD -w -de -dip1000 ddemangle.d -of=$TERMUX_PKG_BUILDDIR/bin/ddemangle