sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

termux_step_patch_package: apply patches in alphabetical order 

Before 32c67fa, patches were applied in alphabetical order, which some packages
like swift relied on, so go back to that.
This commit is contained in:
Butta 2021-09-02 21:13:34 +05:30
parent a3c7f9fb41
commit da42afeb7a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build/termux_step_patch_package.sh
View File

@ -5,16 +5,16 @@ termux_step_patch_package() {
# Suffix patch with ".patch32" or ".patch64" to only apply for
# these bitnesses
local PATCHES=$(find $TERMUX_PKG_BUILDER_DIR -mindepth 1 -maxdepth 1 \
-name \*.patch -o -name \*.patch$TERMUX_ARCH_BITS)
-name \*.patch -o -name \*.patch$TERMUX_ARCH_BITS | sort)
local DEBUG_PATCHES=""
if [ "$TERMUX_DEBUG_BUILD" = "true" ]; then
DEBUG_PATCHES=$(find $TERMUX_PKG_BUILDER_DIR -mindepth 1 -maxdepth 1 -name \*.patch.debug)
DEBUG_PATCHES=$(find $TERMUX_PKG_BUILDER_DIR -mindepth 1 -maxdepth 1 -name \*.patch.debug | sort)
fi
local ON_DEVICE_PATCHES=""
# .patch.ondevice patches should only be applied when building
# on device
if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
ON_DEVICE_PATCHES=$(find $TERMUX_PKG_BUILDER_DIR -mindepth 1 -maxdepth 1 -name \*.patch.ondevice)
ON_DEVICE_PATCHES=$(find $TERMUX_PKG_BUILDER_DIR -mindepth 1 -maxdepth 1 -name \*.patch.ondevice | sort)
fi
shopt -s nullglob
for patch in $PATCHES $DEBUG_PATCHES $ON_DEVICE_PATCHES; do