Updates (#944)

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index af3d0c5..f7636d9 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.8
+       local TERMUX_GO_VERSION=go1.8.1
        local TERMUX_GO_PLATFORM=linux-amd64
 
        local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}
@@ -83,14 +83,15 @@ 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" \
-                       53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca
+                       a579ab19d5237e263254f1eac5352efcf1d70b9dacadb6d6bb12b0911ede8994
+
        ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
 }
 
 # Utility function for cmake-built packages to setup a current cmake.
 termux_setup_cmake() {
-       local TERMUX_CMAKE_MAJORVESION=3.7
-       local TERMUX_CMAKE_MINORVERSION=2
+       local TERMUX_CMAKE_MAJORVESION=3.8
+       local TERMUX_CMAKE_MINORVERSION=0
        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
@@ -98,7 +99,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" \
-                               0e6ec35d4fa9bf79800118916b51928b6471d5725ff36f1d0de5ebb34dcd5406
+                               330357990d84599f9c1a87f568a724f0fe5de1687c32961dda689d52588a5b24
                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" \
@@ -157,6 +158,8 @@ 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
@@ -220,8 +223,6 @@ termux_step_setup_variables() {
        # that everyone gets an updated toolchain:
        TERMUX_STANDALONE_TOOLCHAIN+="-v17"
 
-       export TERMUX_TAR="tar"
-       export TERMUX_TOUCH="touch"
        export prefix=${TERMUX_PREFIX}
        export PREFIX=${TERMUX_PREFIX}
        export PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig
@@ -405,7 +406,7 @@ termux_step_extract_package() {
        if [ "${file##*.}" = zip ]; then
                unzip -q "$file"
        else
-               $TERMUX_TAR xf "$file"
+               tar xf "$file"
        fi
        mv $folder "$TERMUX_PKG_SRCDIR"
 }
@@ -820,12 +821,12 @@ termux_step_extract_into_massagedir() {
 
        # Build diff tar with what has changed during the build:
        cd $TERMUX_PREFIX
-       $TERMUX_TAR -N "$TERMUX_BUILD_TS_FILE" -czf "$TARBALL_ORIG" .
+       tar -N "$TERMUX_BUILD_TS_FILE" -czf "$TARBALL_ORIG" .
 
        # Extract tar in order to massage it
        mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"
        cd "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"
-       $TERMUX_TAR xf "$TARBALL_ORIG"
+       tar xf "$TARBALL_ORIG"
        rm "$TARBALL_ORIG"
 }
 
@@ -862,10 +863,11 @@ termux_step_massage() {
        # Move over sbin to bin:
        for file in sbin/*; do if test -f "$file"; then mv "$file" bin/; fi; done
 
-        # Remove world permissions and add write permissions.
+       # Remove world permissions and add write permissions.
        # The -f flag is used to suppress warnings about dangling symlinks (such
        # as ones to /system/... which may not exist on the build machine):
-        find . -exec chmod -f u+w,o-rwx \{\} \;
+        find . -exec chmod -f u+w,g-rwx,o-rwx \{\} \;
+
        if [ "$TERMUX_DEBUG" = "" ]; then
                # Strip binaries. file(1) may fail for certain unusual files, so disable pipefail.
                set +e +o pipefail
@@ -934,7 +936,7 @@ termux_step_massage() {
                cd "$SUB_PKG_DIR/massage"
                local SUB_PKG_INSTALLSIZE
                SUB_PKG_INSTALLSIZE=$(du -sk . | cut -f 1)
-               $TERMUX_TAR -cJf "$SUB_PKG_PACKAGE_DIR/data.tar.xz" .
+               tar -cJf "$SUB_PKG_PACKAGE_DIR/data.tar.xz" .
 
                mkdir -p DEBIAN
                cd DEBIAN
@@ -949,7 +951,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
-               $TERMUX_TAR -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" .
+               tar -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" .
 
                for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done
 
@@ -988,7 +990,7 @@ termux_step_create_datatar() {
        if [ -z "${TERMUX_PKG_METAPACKAGE+x}" ] && [ "$(find . -type f)" = "" ]; then
                termux_error_exit "No files in package"
        fi
-       $TERMUX_TAR -cJf "$TERMUX_PKG_PACKAGEDIR/data.tar.xz" .
+       tar -cJf "$TERMUX_PKG_PACKAGEDIR/data.tar.xz" .
 }
 
 termux_step_create_debscripts() {
@@ -1028,7 +1030,7 @@ termux_step_create_debfile() {
        termux_step_create_debscripts
 
        # Create control.tar.xz
-       $TERMUX_TAR -cJf "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" .
+       tar -cJf "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" .
 
        test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary"
        TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb