From c99b5ee87db6432ce6b7c70e6f66b3cf472378ce Mon Sep 17 00:00:00 2001 From: buttaface Date: Fri, 3 Apr 2020 01:02:31 +0530 Subject: [PATCH] TERMUX_PKG_QUICK_REBUILD: disable reapplying the host build patches too (#5110) --- scripts/build/termux_step_handle_hostbuild.sh | 8 +++++--- scripts/build/termux_step_patch_package.sh | 2 +- scripts/build/termux_step_start_build.sh | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/build/termux_step_handle_hostbuild.sh b/scripts/build/termux_step_handle_hostbuild.sh index 54bec3d61..5638c41d8 100644 --- a/scripts/build/termux_step_handle_hostbuild.sh +++ b/scripts/build/termux_step_handle_hostbuild.sh @@ -3,9 +3,11 @@ termux_step_handle_hostbuild() { [ "$TERMUX_PKG_HOSTBUILD" = "false" ] && return cd "$TERMUX_PKG_SRCDIR" - for patch in $TERMUX_PKG_BUILDER_DIR/*.patch.beforehostbuild; do - test -f "$patch" && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$patch" | patch --silent -p1 - done + if [ "$TERMUX_PKG_QUICK_REBUILD" = "false" ]; then + for patch in $TERMUX_PKG_BUILDER_DIR/*.patch.beforehostbuild; do + test -f "$patch" && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$patch" | patch --silent -p1 + done + fi local TERMUX_HOSTBUILD_MARKER="$TERMUX_PKG_HOSTBUILD_DIR/TERMUX_BUILT_FOR_$TERMUX_PKG_VERSION" if [ ! -f "$TERMUX_HOSTBUILD_MARKER" ]; then diff --git a/scripts/build/termux_step_patch_package.sh b/scripts/build/termux_step_patch_package.sh index 033bc9fd0..5c753afbc 100644 --- a/scripts/build/termux_step_patch_package.sh +++ b/scripts/build/termux_step_patch_package.sh @@ -6,7 +6,7 @@ termux_step_patch_package() { if [ "$TERMUX_DEBUG" = "true" ]; then DEBUG_PATCHES=$(find $TERMUX_PKG_BUILDER_DIR -mindepth 1 -maxdepth 1 -name \*.patch.debug) fi - if [ "$TERMUX_PKG_QUICK_REBUILD" != "true" ]; then + if [ "$TERMUX_PKG_QUICK_REBUILD" = "false" ]; then # Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses: shopt -s nullglob for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,} $DEBUG_PATCHES; do diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index 4eb2a894b..0ac302ce7 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -128,7 +128,7 @@ termux_step_start_build() { -e "s|@TERMUX_ARCH@|$TERMUX_ARCH|g" > $TERMUX_PREFIX/bin/llvm-config chmod 755 $TERMUX_PREFIX/bin/llvm-config fi - if [ "$TERMUX_PKG_QUICK_REBUILD" != "true" ]; then + if [ "$TERMUX_PKG_QUICK_REBUILD" = "false" ]; then # Following directories may contain files with read-only permissions which # makes them undeletable. We need to fix that. [ -d "$TERMUX_PKG_BUILDDIR" ] && chmod +w -R "$TERMUX_PKG_BUILDDIR"