Remove TERMUX_JACK and TERMUX_JILL

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index da5a3c8..9018f06 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -119,7 +119,7 @@ termux_setup_meson() {
                (cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
        fi
        TERMUX_MESON="$MESON_FOLDER/meson.py"
-       TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-v1.txt
+       TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-$TERMUX_ARCH-v1.txt
        if [ ! -f $TERMUX_MESON_CROSSFILE ]; then
                local MESON_CPU MESON_CPU_FAMILY
                if [ $TERMUX_ARCH = "arm" ]; then
@@ -160,7 +160,7 @@ termux_setup_meson() {
 # Utility function for cmake-built packages to setup a current cmake.
 termux_setup_cmake() {
        local TERMUX_CMAKE_MAJORVESION=3.9
-       local TERMUX_CMAKE_MINORVERSION="0"
+       local TERMUX_CMAKE_MINORVERSION=1
        local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
        local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
        local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -168,7 +168,7 @@ termux_setup_cmake() {
        if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
                termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
                                "$TERMUX_CMAKE_TARFILE" \
-                               e714ddd55ab9be7ec5e4d30ca1ceee5e23406d7d3bf14457a67180cf54d9834a
+                               ecbaf72981ccd09d9dade6d580cf1213eef15ef95a675dd9d4f0d693f134644f
                rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64"
                tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
                mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \
@@ -254,8 +254,8 @@ termux_step_setup_variables() {
        : "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}"
        : "${TERMUX_DEBUG:=""}"
        : "${TERMUX_PKG_API_LEVEL:="21"}"
-       : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.3"}"
-       : "${TERMUX_NDK_VERSION:="15.1"}"
+       : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="26.0.1"}"
+       : "${TERMUX_NDK_VERSION:="15.2"}"
 
        if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then
                TERMUX_ARCH_BITS=64
@@ -280,8 +280,6 @@ termux_step_setup_variables() {
        # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
        # the standalone toolchain.
        TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx
-       TERMUX_JACK=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jack.jar
-       TERMUX_JILL=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jill.jar
 
        TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache"
        TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs"
@@ -306,13 +304,16 @@ termux_step_setup_variables() {
        TERMUX_PKG_EXTRA_MAKE_ARGS=""
        TERMUX_PKG_BUILD_IN_SRC=""
        TERMUX_PKG_RM_AFTER_INSTALL=""
+       TERMUX_PKG_BREAKS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
        TERMUX_PKG_DEPENDS=""
+       TERMUX_PKG_BUILD_DEPENDS=""
        TERMUX_PKG_HOMEPAGE=""
        TERMUX_PKG_DESCRIPTION="FIXME:Add description"
        TERMUX_PKG_FOLDERNAME=""
        TERMUX_PKG_KEEP_STATIC_LIBRARIES="false"
        TERMUX_PKG_ESSENTIAL=""
        TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
+       TERMUX_PKG_RECOMMENDS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
        TERMUX_PKG_REPLACES=""
        TERMUX_PKG_CONFFILES=""
        TERMUX_PKG_INCLUDE_IN_DEVPACKAGE=""
@@ -1041,6 +1042,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
@@ -1081,6 +1083,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
@@ -1146,9 +1149,11 @@ termux_step_create_debfile() {
                Description: $TERMUX_PKG_DESCRIPTION
                Homepage: $TERMUX_PKG_HOMEPAGE
        HERE
+       test ! -z "$TERMUX_PKG_BREAKS" && echo "Breaks: $TERMUX_PKG_BREAKS" >> DEBIAN/control
        test ! -z "$TERMUX_PKG_DEPENDS" && echo "Depends: $TERMUX_PKG_DEPENDS" >> DEBIAN/control
        test ! -z "$TERMUX_PKG_ESSENTIAL" && echo "Essential: yes" >> DEBIAN/control
        test ! -z "$TERMUX_PKG_CONFLICTS" && echo "Conflicts: $TERMUX_PKG_CONFLICTS" >> DEBIAN/control
+       test ! -z "$TERMUX_PKG_RECOMMENDS" && echo "Recommends: $TERMUX_PKG_RECOMMENDS" >> DEBIAN/control
        test ! -z "$TERMUX_PKG_REPLACES" && echo "Replaces: $TERMUX_PKG_REPLACES" >> DEBIAN/control
 
        # Create DEBIAN/conffiles (see https://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html):