Browse Source

build-package.sh: enable use of DT_RUNPATH, set minimal API level to 24

emacs-27
Leonid Plyushch 6 years ago
parent
commit
a48d94ce2b
  1. 5
      scripts/build/termux_step_setup_toolchain.sh
  2. 2
      scripts/build/termux_step_setup_variables.sh

5
scripts/build/termux_step_setup_toolchain.sh

@ -24,9 +24,8 @@ termux_step_setup_toolchain() {
export READELF=$TERMUX_HOST_PLATFORM-readelf export READELF=$TERMUX_HOST_PLATFORM-readelf
export STRIP=$TERMUX_HOST_PLATFORM-strip export STRIP=$TERMUX_HOST_PLATFORM-strip
# Android 7 started to support DT_RUNPATH (but not DT_RPATH), so we may want # Android 7 started to support DT_RUNPATH (but not DT_RPATH).
# LDFLAGS+="-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" LDFLAGS+=" -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags"
# and no longer remove DT_RUNPATH in termux-elf-cleaner.
if [ "$TERMUX_ARCH" = "arm" ]; then if [ "$TERMUX_ARCH" = "arm" ]; then
# https://developer.android.com/ndk/guides/standalone_toolchain.html#abi_compatibility: # https://developer.android.com/ndk/guides/standalone_toolchain.html#abi_compatibility:

2
scripts/build/termux_step_setup_variables.sh

@ -7,7 +7,7 @@ termux_step_setup_variables() {
: "${TERMUX_PREFIX:="/data/data/com.termux/files/usr"}" : "${TERMUX_PREFIX:="/data/data/com.termux/files/usr"}"
: "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}" : "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}"
: "${TERMUX_DEBUG:=""}" : "${TERMUX_DEBUG:=""}"
: "${TERMUX_PKG_API_LEVEL:="21"}" : "${TERMUX_PKG_API_LEVEL:="24"}"
: "${TERMUX_NO_CLEAN:="false"}" : "${TERMUX_NO_CLEAN:="false"}"
: "${TERMUX_QUIET_BUILD:="false"}" : "${TERMUX_QUIET_BUILD:="false"}"
: "${TERMUX_DEBDIR:="${TERMUX_SCRIPTDIR}/debs"}" : "${TERMUX_DEBDIR:="${TERMUX_SCRIPTDIR}/debs"}"

Loading…
Cancel
Save