X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/9462fe825706d989e7ce1a758e2ef87594d8ce2b..382cfb780ca9a40f80e3932544bd32aeccb66e5a:/build-package.sh diff --git a/build-package.sh b/build-package.sh index 1cc958aa..c670f37d 100755 --- a/build-package.sh +++ b/build-package.sh @@ -2,75 +2,113 @@ set -e -o pipefail -u -if [ "$#" -ne 1 ]; then echo "ERROR: Specify one argument (name of or path to package)"; exit 1; fi -export TERMUX_PKG_NAME=`basename $1` -export TERMUX_SCRIPTDIR=`cd $(dirname $0); pwd` - -if [[ $1 == *"/"* ]]; then - # Path to directory which may be outside this repo: - if [ ! -d $1 ]; then echo "ERROR: '$1' seems to be a path but is not a directory"; exit 1; fi - export TERMUX_PKG_BUILDER_DIR=`realpath $1` -else - # Package name: - export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME -fi -export TERMUX_PKG_BUILDER_SCRIPT=$TERMUX_PKG_BUILDER_DIR/build.sh -if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then echo "ERROR: No build.sh script at supposed package dir $TERMUX_PKG_BUILDER_DIR!"; exit 1; fi - -echo "termux - building $1..." -test -t 1 && printf "\033]0;$1...\007" - -# Read settings from .termuxrc if existing +# Read settings from .termuxrc if existing: test -f $HOME/.termuxrc && . $HOME/.termuxrc -# Configurable settings -: ${NDK:="${HOME}/lib/android-ndk"} +# Configurable settings: : ${ANDROID_HOME:="${HOME}/lib/android-sdk"} -if [ ! -d "$NDK" ]; then echo 'ERROR: $NDK not defined as pointing at a directory - define it pointing at a android NDK installation!'; exit 1; fi +: ${NDK:="${HOME}/lib/android-ndk"} : ${TERMUX_MAKE_PROCESSES:='4'} -: ${TERMUX_TOPDIR:="$HOME/termux"} -: ${TERMUX_ARCH:="arm"} # (arm|aarch64|i686|x86_64) - the x86_64 arch is not yet used or tested. -TERMUX_ARCH_BITS="32" -if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then - TERMUX_ARCH_BITS="64" -fi +: ${TERMUX_TOPDIR:="$HOME/.termux-build"} +: ${TERMUX_ARCH:="aarch64"} # (arm|aarch64|i686|x86_64) - the x86_64 arch is not yet used or tested. : ${TERMUX_CLANG:=""} # Set to non-empty to use clang. -: ${TERMUX_HOST_PLATFORM:="${TERMUX_ARCH}-linux-android"} -if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}eabi"; fi : ${TERMUX_PREFIX:='/data/data/com.termux/files/usr'} : ${TERMUX_ANDROID_HOME:='/data/data/com.termux/files/home'} : ${TERMUX_DEBUG:=""} : ${TERMUX_PROCESS_DEB:=""} : ${TERMUX_API_LEVEL:="21"} +: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="24.0.1"} +: ${TERMUX_NDK_VERSION:="12"} + +# Handle command-line arguments: +show_usage () { + echo "Usage: ./build-package.sh [-a ARCH] PACKAGE" + echo "Build a package." + echo "" + exit 1 +} +while getopts :a:h option +do + case "$option" in + a) TERMUX_ARCH="$OPTARG";; + h) show_usage;; + ?) echo "./build-package.sh: illegal option -$OPTARG"; exit 1;; + esac +done +shift $(($OPTIND-1)) +if [ "$#" -ne 1 ]; then show_usage; fi + +# Check the NDK: +if [ ! -d "$NDK" ]; then + echo 'ERROR: $NDK not defined as pointing at a directory - define it pointing at a android NDK installation!' + exit 1 +fi +if grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION" $NDK/source.properties; then + : +else + echo "Wrong NDK version - we need $TERMUX_NDK_VERSION" + exit 1 +fi + +# Compute standalone toolchain dir, bitness of arch and name of host platform: +TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/android-standalone-toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}-" if [ "$TERMUX_CLANG" = "" ]; then - : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc4.9"} + TERMUX_STANDALONE_TOOLCHAIN+="gcc4.9" +else + TERMUX_STANDALONE_TOOLCHAIN+="clang38" +fi +if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then + TERMUX_ARCH_BITS=64 +else + TERMUX_ARCH_BITS=32 +fi +TERMUX_HOST_PLATFORM="${TERMUX_ARCH}-linux-android" +if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}eabi"; fi + +# Check the package to build: +TERMUX_PKG_NAME=`basename $1` +export TERMUX_SCRIPTDIR=`cd $(dirname $0); pwd` +if [[ $1 == *"/"* ]]; then + # Path to directory which may be outside this repo: + if [ ! -d $1 ]; then echo "ERROR: '$1' seems to be a path but is not a directory"; exit 1; fi + export TERMUX_PKG_BUILDER_DIR=`realpath $1` else - : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-clang38"} + # Package name: + export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME +fi +TERMUX_PKG_BUILDER_SCRIPT=$TERMUX_PKG_BUILDER_DIR/build.sh +if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then + echo "ERROR: No build.sh script at supposed package dir $TERMUX_PKG_BUILDER_DIR!" + exit 1 fi -: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.2"} + +# Handle 'all' arch: +if [ $TERMUX_ARCH = 'all' ]; then + for arch in 'arm' 'i686' 'aarch64'; do + ./build-package.sh -a $arch $1 + done + exit +fi + +echo "termux - building $1 for arch $TERMUX_ARCH..." +test -t 1 && printf "\033]0;$1...\007" + # We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from # the standalone toolchain. TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx +TERMUX_JACK=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jack.jar +TERMUX_JILL=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jill.jar # We put this after system PATH to avoid picking up toolchain stripped python export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin # Make $TERMUX_TAR and $TERMUX_TOUCH point at gnu versions: export TERMUX_TAR="tar" -test `uname` = "Darwin" && TERMUX_TAR=gnutar +test `uname` = "Darwin" && TERMUX_TAR=gtar export TERMUX_TOUCH="touch" test `uname` = "Darwin" && TERMUX_TOUCH=gtouch -# Compute NDK version. We remove the first character (the r in e.g. r9d) to get a version number which can be used in packages): -export TERMUX_NDK_VERSION=11 -if grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION" $NDK/source.properties; then - : -else - echo "Wrong NDK version - we need $TERMUX_NDK_VERSION" - exit 1 -fi - export prefix=${TERMUX_PREFIX} # prefix is used by some makefiles #export ACLOCAL="aclocal -I $TERMUX_PREFIX/share/aclocal" export AR=$TERMUX_HOST_PLATFORM-ar @@ -80,7 +118,7 @@ if [ "$TERMUX_CLANG" = "" ]; then export CXX=$TERMUX_HOST_PLATFORM-g++ _SPECSFLAG="-specs=$TERMUX_SCRIPTDIR/termux.spec" else - export AS=${TERMUX_HOST_PLATFORM}-clang + export AS=${TERMUX_HOST_PLATFORM}-gcc export CC=$TERMUX_HOST_PLATFORM-clang export CXX=$TERMUX_HOST_PLATFORM-clang++ # TODO: clang does not have specs file, how to ensure pie @@ -102,25 +140,22 @@ export CFLAGS="$_SPECSFLAG" export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib" if [ "$TERMUX_ARCH" = "arm" ]; then - # For hard support: http://blog.alexrp.com/2014/02/18/android-hard-float-support/ - # "First, to utilize the hard float ABI, you must either compile every last component of your application - # as hard float (the -mhard-float GCC/Clang switch), or mark individual functions with the appropriate - # __attribute__ to indicate the desired ABI. For example, to mark a function so that it’s called with the - # soft float ABI, stick __attribute__((pcs("aapcs"))) on it. - # Note that the NDK will link to a libm which uses the aforementioned attribute on all of its functions. - # This means that if you use libm functions a lot, you’re not likely to get much of a boost in those places. - # The way to fix this is to add -mhard-float -D_NDK_MATH_NO_SOFTFP=1 to your GCC/Clang command line. Then - # add -lm_hard to your linker command line (or -Wl,-lm_hard if you just invoke GCC/Clang to link). This will - # make your application link statically to a libm compiled for the hard float ABI. The only downside of this - # is that your application will increase somewhat in size." - CFLAGS+=" -march=armv7-a -mfpu=neon -mhard-float -Wl,--no-warn-mismatch" - LDFLAGS+=" -march=armv7-a -Wl,--no-warn-mismatch" + CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp" + # "first flag instructs the linker to pick libgcc.a, libgcov.a, and + # crt*.o, which are tailored for armv7-a" + # - https://developer.android.com/ndk/guides/standalone_toolchain.html + LDFLAGS+=" -march=armv7-a -Wl,--fix-cortex-a8" elif [ $TERMUX_ARCH = "i686" ]; then # From $NDK/docs/CPU-ARCH-ABIS.html: CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse" elif [ $TERMUX_ARCH = "aarch64" ]; then LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib" LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib" +elif [ $TERMUX_ARCH = "x86_64" ]; then + : +else + echo "Error: Invalid arch '$TERMUX_ARCH' - support arches are 'arm', 'i686', 'aarch64', 'x86_64'" + exit 1 fi if [ -n "$TERMUX_DEBUG" ]; then @@ -151,34 +186,33 @@ if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then else _TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-clang" fi + + # Do not put toolchain in place until we are done with setup, to avoid having a half setup + # toolchain left in place if something goes wrong (or process is just aborted): + _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp + rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR + bash $NDK/build/tools/make-standalone-toolchain.sh --platform=android-$TERMUX_API_LEVEL --toolchain=${_TERMUX_TOOLCHAIN} \ - --install-dir=$TERMUX_STANDALONE_TOOLCHAIN + --install-dir=$_TERMUX_TOOLCHAIN_TMPDIR if [ "arm" = $TERMUX_ARCH ]; then # Fix to allow e.g. to be included: - cp $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/arm-linux-androideabi/armv7-a/bits/* $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/bits + cp $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/arm-linux-androideabi/armv7-a/bits/* $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/bits fi - cd $TERMUX_STANDALONE_TOOLCHAIN/sysroot + cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot for f in $TERMUX_SCRIPTDIR/ndk_patches/*.patch; do sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $f | \ sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \ - patch -p1; - echo "PATCHING FILE $f done!" + patch --silent -p1; done # elf.h is taken from glibc since the elf.h in the NDK is lacking. # sysexits.h is header-only and used by a few programs. - cp $TERMUX_SCRIPTDIR/ndk_patches/{elf.h,sysexits.h} $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include + cp $TERMUX_SCRIPTDIR/ndk_patches/{elf.h,sysexits.h} $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include + mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN fi export TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache" -export TERMUX_COMMON_DEBDIR="$TERMUX_TOPDIR/_deb" -mkdir -p $TERMUX_COMMON_CACHEDIR $TERMUX_COMMON_DEBDIR - -# Get fresh versions of config.sub and config.guess -for f in config.sub config.guess; do test ! -f $TERMUX_COMMON_CACHEDIR/$f && curl "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=${f};hb=HEAD" > $TERMUX_COMMON_CACHEDIR/$f; done -# Have a debian-binary file ready for deb packaging: -test ! -f $TERMUX_COMMON_CACHEDIR/debian-binary && echo "2.0" > $TERMUX_COMMON_CACHEDIR/debian-binary -# The host tuple that may be given to --host configure flag, but normally autodetected so not needed explicitly -TERMUX_HOST_TUPLE=`sh $TERMUX_COMMON_CACHEDIR/config.guess` +export TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs" +mkdir -p $TERMUX_COMMON_CACHEDIR $TERMUX_DEBDIR TERMUX_PKG_BUILDDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/build TERMUX_PKG_CACHEDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/cache @@ -205,12 +239,13 @@ TERMUX_PKG_ESSENTIAL="" TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts TERMUX_PKG_CONFFILES="" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="" +TERMUX_PKG_DEVPACKAGE_DEPENDS="" # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR: TERMUX_PKG_HOSTBUILD="" TERMUX_PKG_MAINTAINER="Fredrik Fornwall " # Cleanup old state -rm -Rf $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_SRCDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_MASSAGEDIR +rm -Rf $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_SRCDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_MASSAGEDIR # If $TERMUX_PREFIX already exists, it may have been built for a different arch TERMUX_ARCH_FILE=/data/TERMUX_ARCH @@ -221,8 +256,6 @@ if [ -f "${TERMUX_ARCH_FILE}" ]; then mkdir -p $TERMUX_DATA_BACKUPDIRS TERMUX_DATA_PREVIOUS_BACKUPDIR=$TERMUX_DATA_BACKUPDIRS/$TERMUX_PREVIOUS_ARCH TERMUX_DATA_CURRENT_BACKUPDIR=$TERMUX_DATA_BACKUPDIRS/$TERMUX_ARCH - echo "NOTE: Different archs - building for $TERMUX_ARCH, but current $TERMUX_PREVIOUS_ARCH" - echo " Saving current /data/data to $TERMUX_DATA_PREVIOUS_BACKUPDIR" # Save current /data (removing old backup if any) if test -e $TERMUX_DATA_PREVIOUS_BACKUPDIR; then echo "ERROR: Directory already exists" @@ -231,7 +264,6 @@ if [ -f "${TERMUX_ARCH_FILE}" ]; then mv /data/data $TERMUX_DATA_PREVIOUS_BACKUPDIR # Restore new one (if any) if [ -d $TERMUX_DATA_CURRENT_BACKUPDIR ]; then - echo " Restoring old backupdir from $TERMUX_DATA_CURRENT_BACKUPDIR" mv $TERMUX_DATA_CURRENT_BACKUPDIR /data/data fi fi @@ -241,6 +273,36 @@ echo $TERMUX_ARCH > $TERMUX_ARCH_FILE # Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build) mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp,include} +termux_download() { + URL="$1" + DESTINATION="$2" + + TMPFILE=`mktemp $TERMUX_PKG_TMPDIR/download.XXXXXXXXX` + for i in 1 2 3; do + if curl -L --fail --retry 2 -o "$TMPFILE" "$URL"; then + mv "$TMPFILE" "$DESTINATION" + return + else + echo "Download of $1 failed (attempt $i/3)" 1>&2 + sleep 6 + fi + done + echo "Failed to download $1 - exiting" 1>&2 + exit 1 +} + +# Get fresh versions of config.sub and config.guess +for f in config.sub config.guess; do + if [ ! -f $TERMUX_COMMON_CACHEDIR/$f ]; then + termux_download "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=${f};hb=HEAD" $TERMUX_COMMON_CACHEDIR/$f + fi +done + +# Have a debian-binary file ready for deb packaging: +test ! -f $TERMUX_COMMON_CACHEDIR/debian-binary && echo "2.0" > $TERMUX_COMMON_CACHEDIR/debian-binary +# The host tuple that may be given to --host configure flag, but normally autodetected so not needed explicitly +TERMUX_HOST_TUPLE=`sh $TERMUX_COMMON_CACHEDIR/config.guess` + # Make $TERMUX_PREFIX/bin/sh executable on the builder, so that build script can assume that it works # on both builder and host later on: ln -f -s /bin/sh $TERMUX_PREFIX/bin/sh @@ -293,7 +355,7 @@ termux_step_extract_package () { filename=`basename $TERMUX_PKG_SRCURL` file=$TERMUX_PKG_CACHEDIR/$filename # Set "TERMUX_PKG_NO_SRC_CACHE=yes" in package to never cache packages, such as in git builds: - test -n ${TERMUX_PKG_NO_SRC_CACHE-""} -o ! -f $file && curl --retry 3 -o $file -L $TERMUX_PKG_SRCURL + test -n ${TERMUX_PKG_NO_SRC_CACHE-""} -o ! -f $file && termux_download $TERMUX_PKG_SRCURL $file 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=`echo $folder | sed 's/_/-/'` # dpkg uses _ in tar filename, but - in folder @@ -327,7 +389,7 @@ termux_step_patch_package () { for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,}; do test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | \ sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \ - patch -p1 + patch --silent -p1 done find . -name config.sub -exec chmod u+w '{}' \; -exec cp $TERMUX_COMMON_CACHEDIR/config.sub '{}' \; @@ -369,9 +431,6 @@ termux_step_configure () { for f in $TERMUX_PREFIX/bin/*config; do test -f $f && cp $f $TERMUX_PKG_TMPDIR/config-scripts done - set +e +o pipefail - find $TERMUX_PKG_TMPDIR/config-scripts | xargs file | grep -F " script" | cut -f 1 -d : | xargs sed -i -E "s@^#\!/system/bin/sh@#\!/bin/sh@" - set -e -o pipefail export PATH=$TERMUX_PKG_TMPDIR/config-scripts:$PATH # See http://wiki.buici.com/xwiki/bin/view/Programing+C+and+C%2B%2B/Autoconf+and+RPL_MALLOC @@ -501,7 +560,11 @@ termux_step_massage () { _DEVEL_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-dev.subpackage.sh echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > $_DEVEL_SUBPACKAGE_FILE echo TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\" >> $_DEVEL_SUBPACKAGE_FILE - echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE + if [ -n "$TERMUX_PKG_DEVPACKAGE_DEPENDS" ]; then + echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME,$TERMUX_PKG_DEVPACKAGE_DEPENDS\" >> $_DEVEL_SUBPACKAGE_FILE + else + echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE + fi if [ x$TERMUX_PKG_CONFLICTS != x ]; then # Assume that dev packages conflicts as well. echo "TERMUX_SUBPKG_CONFLICTS=${TERMUX_PKG_CONFLICTS}-dev" >> $_DEVEL_SUBPACKAGE_FILE @@ -514,7 +577,6 @@ termux_step_massage () { SUB_PKG_NAME=`basename $subpackage .subpackage.sh` # Default value is same as main package, but sub package may override: TERMUX_SUBPKG_PLATFORM_INDEPENDENT=$TERMUX_PKG_PLATFORM_INDEPENDENT - echo "$SUB_PKG_NAME => $subpackage" SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME TERMUX_SUBPKG_DEPENDS="" TERMUX_SUBPKG_CONFLICTS="" @@ -557,7 +619,7 @@ HERE $TERMUX_TAR -cJf $SUB_PKG_PACKAGE_DIR/control.tar.xz . # Create the actual .deb file: - TERMUX_SUBPKG_DEBFILE=$TERMUX_COMMON_DEBDIR/${SUB_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb + TERMUX_SUBPKG_DEBFILE=$TERMUX_DEBDIR/${SUB_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb ar cr $TERMUX_SUBPKG_DEBFILE \ $TERMUX_COMMON_CACHEDIR/debian-binary \ $SUB_PKG_PACKAGE_DIR/control.tar.xz \ @@ -615,7 +677,7 @@ 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 - curl -o $TERMUX_BUILDGO_TAR https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz + termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz $TERMUX_BUILDGO_TAR ( cd $TERMUX_COMMON_CACHEDIR; tar xf $TERMUX_BUILDGO_TAR; mv go $TERMUX_BUILDGO_FOLDER; rm $TERMUX_BUILDGO_TAR ) } @@ -637,7 +699,7 @@ termux_step_post_extract_package if [ "x$TERMUX_PKG_HOSTBUILD" != "x" ]; then cd $TERMUX_PKG_SRCDIR for patch in $TERMUX_PKG_BUILDER_DIR/*.patch.beforehostbuild; do - test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | patch -p1 + test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | patch --silent -p1 done if [ -f "$TERMUX_PKG_HOSTBUILD_DIR/TERMUX_BUILT_FOR_$TERMUX_PKG_VERSION" ]; then @@ -755,7 +817,7 @@ termux_step_create_debscripts # Create control.tar.xz $TERMUX_TAR -cJf $TERMUX_PKG_PACKAGEDIR/control.tar.xz . # In the .deb ar file there should be a file "debian-binary" with "2.0" as the content: -TERMUX_PKG_DEBFILE=$TERMUX_COMMON_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb +TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb # Create the actual .deb file: ar cr $TERMUX_PKG_DEBFILE \ $TERMUX_COMMON_CACHEDIR/debian-binary \