X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/2f122eed3eaef5f60b0043a3ac6898545e1d6e69..40a7f89896a34594e760f61f58150aba56e8b853:/build-package.sh diff --git a/build-package.sh b/build-package.sh index f7636d92..e989f0ea 100755 --- a/build-package.sh +++ b/build-package.sh @@ -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=1 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 + 10ca0e25b7159a03da0c1ec627e686562dc2a40aad5985fd2088eb684b08e491 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,7 +178,7 @@ 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"}" @@ -1061,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