From a48d94ce2b87fdecd4f7c55b2f5205ce21bdba9c Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Sun, 3 Mar 2019 03:52:05 +0200 Subject: [PATCH] build-package.sh: enable use of DT_RUNPATH, set minimal API level to 24 --- scripts/build/termux_step_setup_toolchain.sh | 5 ++--- scripts/build/termux_step_setup_variables.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 4ca48dcf4..6d49c9f88 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -24,9 +24,8 @@ termux_step_setup_toolchain() { export READELF=$TERMUX_HOST_PLATFORM-readelf export STRIP=$TERMUX_HOST_PLATFORM-strip - # Android 7 started to support DT_RUNPATH (but not DT_RPATH), so we may want - # LDFLAGS+="-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" - # and no longer remove DT_RUNPATH in termux-elf-cleaner. + # Android 7 started to support DT_RUNPATH (but not DT_RPATH). + LDFLAGS+=" -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" if [ "$TERMUX_ARCH" = "arm" ]; then # https://developer.android.com/ndk/guides/standalone_toolchain.html#abi_compatibility: diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh index fd1dc6cfd..4982e4463 100644 --- a/scripts/build/termux_step_setup_variables.sh +++ b/scripts/build/termux_step_setup_variables.sh @@ -7,7 +7,7 @@ termux_step_setup_variables() { : "${TERMUX_PREFIX:="/data/data/com.termux/files/usr"}" : "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}" : "${TERMUX_DEBUG:=""}" - : "${TERMUX_PKG_API_LEVEL:="21"}" + : "${TERMUX_PKG_API_LEVEL:="24"}" : "${TERMUX_NO_CLEAN:="false"}" : "${TERMUX_QUIET_BUILD:="false"}" : "${TERMUX_DEBDIR:="${TERMUX_SCRIPTDIR}/debs"}"