X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/542aab6b3ff4e1173a9c42890147e91fd2cc4ea0..bc77023419885c9c13f8a4e4447a85d0c9610fdf:/build-package.sh?ds=sidebyside diff --git a/build-package.sh b/build-package.sh index 39a4a612..6d946881 100755 --- 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,7 +83,8 @@ 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" ) } @@ -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 @@ -348,7 +351,12 @@ termux_step_start_build() { # scripts can assume that it works on both builder and host later on: ln -f -s /bin/sh "$TERMUX_PREFIX/bin/sh" - TERMUX_ELF_CLEANER_SRC=$TERMUX_SCRIPTDIR/packages/termux-elf-cleaner/termux-elf-cleaner.cpp + local TERMUX_ELF_CLEANER_SRC=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner.cpp + local TERMUX_ELF_CLEANER_VERSION=$(bash -c ". $TERMUX_SCRIPTDIR/packages/termux-elf-cleaner/build.sh; echo \$TERMUX_PKG_VERSION") + termux_download \ + https://raw.githubusercontent.com/termux/termux-elf-cleaner/v$TERMUX_ELF_CLEANER_VERSION/termux-elf-cleaner.cpp \ + $TERMUX_ELF_CLEANER_SRC \ + 11a38372f4d0e36b7556382c7ecffecae35cee8b68daaee2dbee025f758e17ee if [ "$TERMUX_ELF_CLEANER_SRC" -nt "$TERMUX_ELF_CLEANER" ]; then g++ -std=c++11 -Wall -Wextra -pedantic -Os "$TERMUX_ELF_CLEANER_SRC" -o "$TERMUX_ELF_CLEANER" fi