byobu: Update from 5.111 to 5.114

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 5addc35..87c7818 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -62,9 +62,8 @@ termux_setup_golang() {
                termux_error_exit "Unsupported arch: $TERMUX_ARCH"
        fi
 
-       local TERMUX_GO_VERSION=go1.8rc1
+       local TERMUX_GO_VERSION=go1.8rc2
        local TERMUX_GO_PLATFORM=linux-amd64
-       test "$(uname)" = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 
        local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}
        export GOROOT=$TERMUX_BUILDGO_FOLDER
@@ -75,7 +74,8 @@ termux_setup_golang() {
        local TERMUX_BUILDGO_TAR=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz
        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"
+                       "$TERMUX_BUILDGO_TAR" \
+                       d62c2d44d0c6b434e3cda12505f3c9fb880757e3396af1e9ba861f7b547cc864
        ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
 }
 
@@ -97,6 +97,7 @@ termux_setup_cmake() {
                   $TERMUX_CMAKE_FOLDER
        fi
        export PATH=$TERMUX_CMAKE_FOLDER/bin:$PATH
+       export CMAKE_INSTALL_ALWAYS=1
 }
 
 # First step is to handle command-line arguments. Not to be overridden by packages.
@@ -207,12 +208,10 @@ termux_step_setup_variables() {
        TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}"
        # Bump the below version if a change is made in toolchain setup to ensure
        # that everyone gets an updated toolchain:
-       TERMUX_STANDALONE_TOOLCHAIN+="-v9"
+       TERMUX_STANDALONE_TOOLCHAIN+="-v10"
 
        export TERMUX_TAR="tar"
        export TERMUX_TOUCH="touch"
-       test "$(uname)" = "Darwin" && TERMUX_TAR=gtar
-       test "$(uname)" = "Darwin" && TERMUX_TOUCH=gtouch
        export prefix=${TERMUX_PREFIX}
        export PREFIX=${TERMUX_PREFIX}
        export PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig