Enable dependency checks for out-of-tree packages

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 882a8a6..041380c 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -70,7 +70,7 @@ termux_setup_golang() {
                termux_error_exit "Unsupported arch: $TERMUX_ARCH"
        fi
 
-       local TERMUX_GO_VERSION=go1.9
+       local TERMUX_GO_VERSION=go1.9.2
        local TERMUX_GO_PLATFORM=linux-amd64
 
        local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}
@@ -83,7 +83,7 @@ termux_setup_golang() {
        rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
        termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
                        "$TERMUX_BUILDGO_TAR" \
-                       d70eadefce8e160638a9a6db97f7192d8463069ab33138893ad3bf31b0650a79
+                       de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b
 
        ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
 }
@@ -106,7 +106,7 @@ termux_setup_ninja() {
 # Utility function for cmake-built packages to setup a current meson.
 termux_setup_meson() {
        termux_setup_ninja
-       local MESON_VERSION=0.42.1
+       local MESON_VERSION=0.43.0
        local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION
        if [ ! -d "$MESON_FOLDER" ]; then
                local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz
@@ -114,12 +114,12 @@ termux_setup_meson() {
                termux_download \
                        https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \
                        $MESON_TAR_FILE \
-                       30bdded6fefc48211d30818d96dd34aae56ee86ce9710476f501bd7695469c4b
+                       c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340
                tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR"
                (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-$TERMUX_ARCH-v1.txt
+       TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-$TERMUX_ARCH-v2.txt
        if [ ! -f $TERMUX_MESON_CROSSFILE ]; then
                local MESON_CPU MESON_CPU_FAMILY
                if [ $TERMUX_ARCH = "arm" ]; then
@@ -144,7 +144,7 @@ termux_setup_meson() {
                        c = '$CC'
                        cpp = '$CXX'
                        ld = '$LD'
-                       pkg-config = '$PKG_CONFIG'
+                       pkgconfig = '$PKG_CONFIG'
                        strip = '$STRIP'
                        [properties]
                        needs_exe_wrapper = true
@@ -229,8 +229,6 @@ termux_step_handle_arguments() {
                if [ ! -d "$1" ]; then termux_error_exit "'$1' seems to be a path but is not a directory"; fi
                export TERMUX_PKG_BUILDER_DIR
                TERMUX_PKG_BUILDER_DIR=$(realpath "$1")
-               # Skip depcheck for external package:
-               TERMUX_SKIP_DEPCHECK=true
        else
                # Package name:
                if [ -n "${TERMUX_IS_DISABLED=""}" ]; then
@@ -375,12 +373,10 @@ termux_step_start_build() {
 
        if [ -z "${TERMUX_SKIP_DEPCHECK:=""}" ]; then
                local p TERMUX_ALL_DEPS
-               TERMUX_ALL_DEPS=$(./scripts/buildorder.py "$TERMUX_PKG_NAME")
+               TERMUX_ALL_DEPS=$(./scripts/buildorder.py "$TERMUX_PKG_BUILDER_DIR")
                for p in $TERMUX_ALL_DEPS; do
-                       if [ "$p" != "$TERMUX_PKG_NAME" ]; then
-                               echo "Building dependency $p if necessary..."
-                               ./build-package.sh -a $TERMUX_ARCH -s "$p"
-                       fi
+                       echo "Building dependency $p if necessary..."
+                       ./build-package.sh -a $TERMUX_ARCH -s "$p"
                done
        fi