X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/aea302356f82e5e92da1219ac8d3a35645a36e1e..738da6d85929e5d371fff2274799aef8b3a2e4ab:/build-package.sh diff --git a/build-package.sh b/build-package.sh index 9584b2b8..dcd89f23 100755 --- a/build-package.sh +++ b/build-package.sh @@ -5,38 +5,50 @@ set -e -o pipefail -u # Read settings from .termuxrc if existing: test -f $HOME/.termuxrc && . $HOME/.termuxrc -# Configurable settings: -: ${ANDROID_HOME:="${HOME}/lib/android-sdk"} -: ${NDK:="${HOME}/lib/android-ndk"} -: ${TERMUX_MAKE_PROCESSES:='4'} -: ${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_PROCESS_DEB:=""} -: ${TERMUX_API_LEVEL:="21"} -: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="24.0.1"} -: ${TERMUX_NDK_VERSION:="13"} - # Handle command-line arguments: show_usage () { - echo "Usage: ./build-package.sh [-a ARCH] PACKAGE" - echo "Build a package." - echo "" + echo "Usage: ./build-package.sh [-a ARCH] [-d] [-D] PACKAGE" + echo "Build a package by creating a .deb file in the debs/ folder." + echo " -a The architecture to build for: aarch64(default), arm, i686, x86_64 or all." + echo " -d Build with debug symbols." + echo " -D Build a disabled package in disabled-packages/." exit 1 } -while getopts :a:h option +while getopts :a:hdD option do case "$option" in a) TERMUX_ARCH="$OPTARG";; h) show_usage;; + d) TERMUX_DEBUG=true;; + D) TERMUX_IS_DISABLED=true;; ?) echo "./build-package.sh: illegal option -$OPTARG"; exit 1;; esac done shift $(($OPTIND-1)) if [ "$#" -ne 1 ]; then show_usage; fi +# Configurable settings: +: ${ANDROID_HOME:="${HOME}/lib/android-sdk"} +: ${NDK:="${HOME}/lib/android-ndk"} +: ${TERMUX_MAKE_PROCESSES:='4'} +: ${TERMUX_TOPDIR:="$HOME/.termux-build"} +: ${TERMUX_ARCH:="aarch64"} # arm, aarch64, i686 or x86_64. +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 +: ${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:="13"} +: ${TERMUX_IS_DISABLED:=""} + # 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!' @@ -58,7 +70,11 @@ if [[ $1 == *"/"* ]]; then export TERMUX_PKG_BUILDER_DIR=`realpath $1` else # Package name: - export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME + if [ -n "$TERMUX_IS_DISABLED" ]; then + export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/disabled-packages/$TERMUX_PKG_NAME + else + export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME + fi fi TERMUX_PKG_BUILDER_SCRIPT=$TERMUX_PKG_BUILDER_DIR/build.sh if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then @@ -114,7 +130,6 @@ TERMUX_PKG_HOMEPAGE="" TERMUX_PKG_DESCRIPTION="FIXME:Add description" TERMUX_PKG_FOLDERNAME="" TERMUX_PKG_KEEP_STATIC_LIBRARIES="false" -TERMUX_PKG_KEEP_HEADER_FILES="false" TERMUX_PKG_ESSENTIAL="" TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts TERMUX_PKG_REPLACES="" @@ -169,11 +184,13 @@ termux_download() { # Optional checksum argument: local EXPECTED=$3 if [ $EXPECTED != $ACTUAL_CHECKSUM ]; then - >&2 printf "Wrong checksum for $URL:\nExpected: $EXPECTED\nActual: $ACTUAL_CHECKSUM\n" + >&2 printf "Wrong checksum for %s:\nExpected: %s\nActual: %s\n" \ + "$URL" "$EXPECTED" "$ACTUAL_CHECKSUM" exit 1 fi else - printf "No validation of checksum for $URL:\nActual: $ACTUAL_CHECKSUM\n" + printf "No validation of checksum for %s:\nActual: %s\n" \ + "$URL" "$ACTUAL_CHECKSUM" fi mv "$TMPFILE" "$DESTINATION" return @@ -236,7 +253,7 @@ termux_step_post_extract_package () { # After termux_step_post_extract_package() and before termux_step_patch_package() termux_step_host_build () { $TERMUX_PKG_SRCDIR/configure ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS} - make + make -j $TERMUX_MAKE_PROCESSES } # This should not be overridden @@ -551,7 +568,7 @@ if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" -a "$TERMUX_PKG_BLACKLISTED_ARCHE fi echo "termux - building $1 for arch $TERMUX_ARCH..." -test -t 1 && printf "\033]0;$1...\007" +test -t 1 && printf "\033]0;%s...\007" "$1" # Compute full version: TERMUX_PKG_FULLVERSION=$TERMUX_PKG_VERSION @@ -564,19 +581,11 @@ fi TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}" # Bump the below version if a change is made in toolchain setup to ensure # that everyone gets an updated toolchain: -TERMUX_STANDALONE_TOOLCHAIN+="-v2" +TERMUX_STANDALONE_TOOLCHAIN+="-v3" # We put this after system PATH to avoid picking up toolchain stripped python export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin -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 - export AR=$TERMUX_HOST_PLATFORM-ar if [ "$TERMUX_PKG_CLANG" = "no" ]; then export AS=${TERMUX_HOST_PLATFORM}-gcc @@ -604,8 +613,8 @@ export STRIP=$TERMUX_HOST_PLATFORM-strip export CFLAGS="$_SPECSFLAG" export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib" # Android 7 started to support DT_RUNPATH (but not DT_RPATH), so we may want -# "-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" here in the future -# - and no longer remove DT_RUNPATH in termux-elf-cleaner. +# LDFLAGS+="-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" +# and no longer remove DT_RUNPATH in termux-elf-cleaner. if [ "$TERMUX_ARCH" = "arm" ]; then CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp" @@ -675,6 +684,14 @@ if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then $TERMUX_ELF_CLEANER usr/lib/*.so + # zlib is really version 1.2.8 in the Android platform (at least + # starting from Android 5), not older as the NDK headers claim. + for file in zconf.h zlib.h; do + curl -o $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/$file \ + https://raw.githubusercontent.com/madler/zlib/v1.2.8/$file + done + unset file + mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN fi @@ -714,7 +731,7 @@ chmod +x $PKG_CONFIG cat > $PKG_CONFIG_LIBDIR/zlib.pc <