From 4a3f6fb1d8a0d829ce8545121db2a92ef178494d Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sat, 30 Jul 2022 17:36:31 +0000 Subject: [PATCH] Update repo --- scripts/build/termux_step_massage.sh | 3 ++- scripts/build/termux_step_start_build.sh | 12 ++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/build/termux_step_massage.sh b/scripts/build/termux_step_massage.sh index ecb79c9d23..f5639939dc 100644 --- a/scripts/build/termux_step_massage.sh +++ b/scripts/build/termux_step_massage.sh @@ -29,7 +29,8 @@ termux_step_massage() { if [ "$TERMUX_PKG_NO_ELF_CLEANER" != "true" ]; then # Remove entries unsupported by Android's linker: - find . \( -path "./bin/*" -o -path "./lib/*" -o -path "./libexec/*" -o -path "./opt/*" \) -type f -print0 | xargs -r -0 "$TERMUX_ELF_CLEANER" + find . \( -path "./bin/*" -o -path "./lib/*" -o -path "./libexec/*" -o -path "./opt/*" \) -type f -print0 | xargs -r -0 \ + "$TERMUX_ELF_CLEANER" --api-level $TERMUX_PKG_API_LEVEL fi if [ "$TERMUX_PKG_NO_SHEBANG_FIX" != "true" ]; then diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index f279bfd39c..7e0568dfcf 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -84,15 +84,11 @@ termux_step_start_build() { return fi - local TERMUX_ELF_CLEANER_SRC=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner.cpp local TERMUX_ELF_CLEANER_VERSION TERMUX_ELF_CLEANER_VERSION=$(bash -c ". $TERMUX_SCRIPTDIR/packages/termux-elf-cleaner/build.sh; echo \$TERMUX_PKG_VERSION") termux_download \ - "https://raw.githubusercontent.com/termux/termux-elf-cleaner/v$TERMUX_ELF_CLEANER_VERSION/termux-elf-cleaner.cpp" \ - "$TERMUX_ELF_CLEANER_SRC" \ - 022197c19129c4e57a37515bd4adcc19e05f9aa7f9ba4fbcab85a20210c39632 - if [ "$TERMUX_ELF_CLEANER_SRC" -nt "$TERMUX_ELF_CLEANER" ]; then - g++ -std=c++11 -Wall -Wextra -pedantic -Os -D__ANDROID_API__=$TERMUX_PKG_API_LEVEL \ - "$TERMUX_ELF_CLEANER_SRC" -o "$TERMUX_ELF_CLEANER" - fi + "https://github.com/termux/termux-elf-cleaner/releases/download/v${TERMUX_ELF_CLEANER_VERSION}/termux-elf-cleaner" \ + "$TERMUX_ELF_CLEANER" \ + 7c29143b9cffb3a9a580f39a7966b2bb36c5fc099da6f4c98dcdedacb14f08a2 + chmod u+x "$TERMUX_ELF_CLEANER" }