X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/174285d97053e7f396ef47e366f41ce8c25e2565..98405fcd8aaf3cbb7da32fabcabf71f849b15b0f:/build-package.sh diff --git a/build-package.sh b/build-package.sh index dad64a0b..a954749e 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.1 + local TERMUX_GO_VERSION=go1.8.3 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" \ - a579ab19d5237e263254f1eac5352efcf1d70b9dacadb6d6bb12b0911ede8994 + 1862f4c3d3907e59b04a757cfda0ea7aa9ef39274af99a784f5be843c80c6772 ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" ) } @@ -91,7 +91,7 @@ termux_setup_golang() { # Utility function for cmake-built packages to setup a current cmake. termux_setup_cmake() { local TERMUX_CMAKE_MAJORVESION=3.8 - local TERMUX_CMAKE_MINORVERSION=0 + local TERMUX_CMAKE_MINORVERSION=2 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 @@ -99,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" \ - 330357990d84599f9c1a87f568a724f0fe5de1687c32961dda689d52588a5b24 + 33e4851d3219b720f4b64fcf617151168f1bffdf5afad25eb4b7f5f58cee3a08 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" \ @@ -178,14 +178,14 @@ termux_step_handle_arguments() { termux_step_setup_variables() { : "${ANDROID_HOME:="${HOME}/lib/android-sdk"}" : "${NDK:="${HOME}/lib/android-ndk"}" - : "${TERMUX_MAKE_PROCESSES:="4"}" + : "${TERMUX_MAKE_PROCESSES:="$(nproc)"}" : "${TERMUX_TOPDIR:="$HOME/.termux-build"}" : "${TERMUX_ARCH:="aarch64"}" # arm, aarch64, i686 or x86_64. : "${TERMUX_PREFIX:="/data/data/com.termux/files/usr"}" : "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}" : "${TERMUX_DEBUG:=""}" : "${TERMUX_API_LEVEL:="21"}" - : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.1"}" + : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.3"}" : "${TERMUX_NDK_VERSION:="14"}" if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then @@ -223,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 @@ -399,7 +397,7 @@ termux_step_extract_package() { termux_download "$TERMUX_PKG_SRCURL" "$file" "$TERMUX_PKG_SHA256" if [ "x$TERMUX_PKG_FOLDERNAME" = "x" ]; then - folder=`basename $filename .tar.bz2` && folder=`basename $folder .tar.gz` && folder=`basename $folder .tar.xz` && folder=`basename $folder .tar.lz` && folder=`basename $folder .tgz` && folder=`basename $folder .zip` + folder="${filename%%.t*}" && folder="${folder%%.zip}" folder="${folder/_/-}" # dpkg uses _ in tar filename, but - in folder else folder=$TERMUX_PKG_FOLDERNAME @@ -408,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" } @@ -823,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" } @@ -938,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 @@ -953,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 @@ -992,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() { @@ -1032,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 @@ -1063,7 +1061,7 @@ termux_step_handle_hostbuild termux_step_setup_toolchain termux_step_patch_package termux_step_replace_guess_scripts -cd "$TERMUX_PKG_BUILDDIR" +cd "$TERMUX_PKG_SRCDIR" termux_step_pre_configure cd "$TERMUX_PKG_BUILDDIR" termux_step_configure