X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/9ec050917e96de1c1b67475a654169345e10b851..7f2c63207141c89bdd95f27a52f84ddf41046882:/build-package.sh?ds=sidebyside diff --git a/build-package.sh b/build-package.sh index 10fc80bd..1628c41e 100755 --- a/build-package.sh +++ b/build-package.sh @@ -255,7 +255,7 @@ termux_step_setup_variables() { : "${TERMUX_DEBUG:=""}" : "${TERMUX_PKG_API_LEVEL:="21"}" : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.3"}" - : "${TERMUX_NDK_VERSION:="15.1"}" + : "${TERMUX_NDK_VERSION:="15.2"}" if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then TERMUX_ARCH_BITS=64 @@ -1043,6 +1043,7 @@ termux_step_massage() { local SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME local TERMUX_SUBPKG_DEPENDS="" local TERMUX_SUBPKG_CONFLICTS="" + local TERMUX_SUBPKG_REPLACES="" local TERMUX_SUBPKG_CONFFILES="" local SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX local SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package @@ -1083,6 +1084,7 @@ termux_step_massage() { HERE test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control + test ! -z "$TERMUX_SUBPKG_REPLACES" && echo "Replaces: $TERMUX_SUBPKG_REPLACES" >> control tar -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" . for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done