Use bash as login shell by default

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 0c8bd42..f7da499 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -1,25 +1,21 @@
 #!/bin/bash
 
-# Required setup for ubuntu (only tested on 15.04):
-# $ apt install asciidoc automake bison cmake flex gettext libglib2.0-dev help2man libc6-dev-i386 libcurl4-openssl-dev libgdk-pixbuf2.0-dev libncurses5-dev libtool lzip m4 mercurial pkg-config scons texinfo xmlto xutils-dev
-#   where libc6-dev-i386 is needed by luajit host part of the build for <sys/cdefs.h>
-#         xutils-dev provides 'makedepend' which openssl build uses
-#         gettext provides 'msgfmt' which apt build uses
-#         libcurl4-openssl-dev is needed by apt build
-#         libglib2.0-dev provides 'glib-genmarshal' which glib build uses
-#         libgdk-pixbuf2.0-dev provides 'gdk-pixbuf-query-loaders' which librsvg build uses
-# Required setup for mac (not regularly used, and may not build all packages):
-# $ port install asciidoc bison cmake flex gnutar help2man lzip mercurial p5-libwww-perl pkgconfig scons xmlto
-#   where Busybox requires that sed is gsed: ln -s /opt/local/bin/gsed /opt/local/bin/sed
-
 set -e -o pipefail -u
 
-if [ "$#" -ne 1 ]; then echo "ERROR: Specify one argument!"; exit 1; fi
-export TERMUX_PKG_NAME=$1
+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`
-export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME
+
+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 such package builder: ${TERMUX_PKG_BUILDER_SCRIPT}!"; exit 1; fi
+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"
@@ -34,6 +30,10 @@ if [ ! -d "$NDK" ]; then echo 'ERROR: $NDK not defined as pointing at a director
 : ${TERMUX_MAKE_PROCESSES:='4'}
 : ${TERMUX_TOPDIR:="$HOME/termux"}
 : ${TERMUX_ARCH:="arm"} # (arm|aarch64|i686|x86_64) - the 64 bit variants do not work yet
+TERMUX_ARCH_BITS="32"
+if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then
+       TERMUX_ARCH_BITS="64"
+fi
 : ${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'}
@@ -287,7 +287,8 @@ termux_step_host_build () {
 # This should not be overridden
 termux_step_patch_package () {
        cd $TERMUX_PKG_SRCDIR
-       for patch in $TERMUX_PKG_BUILDER_DIR/*.patch; do
+       # Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses:
+       for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,}; do
                test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | patch -p1
        done