From c352216c6325543471c9d93bc3e6723afe287dab Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 12 Aug 2019 18:28:41 +0300 Subject: [PATCH] packages: standardize values of several control variables for build.sh Variables TERMUX_PKG_PLATFORM_INDEPENDENT TERMUX_DEBUG TERMUX_PKG_HAS_DEBUG TERMUX_PKG_ESSENTIAL TERMUX_SUBPKG_ESSENTIAL TERMUX_PKG_NO_STATICSPLIT TERMUX_PKG_BUILD_IN_SRC TERMUX_PKG_FORCE_CMAKE TERMUX_PKG_HOSTBUILD should not accept arbitrary values for marking them "enabled". Instead they should accept boolean values which makes them easier to handle and also makes their meaning clear. build-package.sh should make decision based on variable's value but not on whether it is set or empty. %ci:no-build --- build-package.sh | 14 ++++++------ clean.sh | 6 ++--- packages/aapt/build.sh | 4 ++-- packages/abduco/build.sh | 2 +- packages/abuild/build.sh | 2 +- packages/ack-grep/build.sh | 2 +- packages/alpine/build.sh | 2 +- packages/apache2/build.sh | 2 +- packages/apk-tools/build.sh | 2 +- packages/apksigner/build.sh | 2 +- packages/apr/build.sh | 2 +- packages/apt/build.sh | 4 ++-- packages/argp/build.sh | 2 +- packages/asciinema/build.sh | 6 ++--- packages/attr/build.sh | 2 +- packages/autoconf/build.sh | 2 +- packages/automake/build.sh | 2 +- packages/autossh/build.sh | 2 +- packages/bash-completion/build.sh | 2 +- packages/bat/build.sh | 2 +- packages/binutils/build.sh | 4 ++-- packages/bison/build.sh | 2 +- packages/bmon/build.sh | 2 +- packages/boost/build.sh | 4 ++-- packages/brotli/build.sh | 2 +- packages/build-essential/build.sh | 2 +- packages/busybox/build.sh | 8 +++---- packages/bvi/build.sh | 2 +- packages/byobu/build.sh | 2 +- packages/c-ares/build.sh | 2 +- packages/ca-certificates/build.sh | 2 +- packages/cava/build.sh | 2 +- packages/cboard/build.sh | 3 ++- packages/ccnet/build.sh | 2 +- packages/cgdb/build.sh | 2 +- packages/cmake/build.sh | 2 +- packages/cmus/build.sh | 2 +- packages/colordiff/build.sh | 4 ++-- packages/coreutils/build.sh | 4 ++-- packages/cowsay/build.sh | 2 +- packages/ctags/build.sh | 4 ++-- packages/darkhttpd/build.sh | 2 +- packages/dart/build.sh | 2 +- packages/dash/build.sh | 2 +- packages/dasm/build.sh | 2 +- packages/datamash/build.sh | 4 ++-- packages/dcraw/build.sh | 2 +- packages/debootstrap/build.sh | 4 ++-- packages/dialog/build.sh | 2 +- packages/diffutils/build.sh | 4 ++-- packages/docbook-xml/build.sh | 2 +- packages/dos2unix/build.sh | 2 +- packages/dpkg/build.sh | 2 +- packages/dropbear/build.sh | 2 +- packages/dvtm/build.sh | 2 +- packages/e2fsprogs/build.sh | 2 +- packages/ecj/build.sh | 2 +- packages/emacs/build.sh | 4 ++-- packages/erlang/build.sh | 6 ++--- packages/espeak/build.sh | 6 ++--- packages/exa/build.sh | 2 +- packages/fbless/build.sh | 2 +- packages/fd/build.sh | 2 +- packages/fdupes/build.sh | 2 +- packages/figlet/build.sh | 2 +- packages/file/build.sh | 2 +- packages/findutils/build.sh | 2 +- packages/fish/build.sh | 2 +- packages/fsmon/build.sh | 2 +- packages/fzf/build.sh | 2 +- packages/game-repo/build.sh | 2 +- packages/gawk/build.sh | 4 ++-- packages/gcal/build.sh | 2 +- packages/gdb/build.sh | 2 +- packages/getconf/build.sh | 2 +- packages/getmail/build.sh | 4 ++-- packages/gettext/build.sh | 2 +- packages/giflib/build.sh | 2 +- packages/git/build.sh | 4 ++-- packages/gmic/build.sh | 2 +- packages/gnuplot/build.sh | 2 +- packages/golang/build.sh | 4 ++-- packages/gperf/build.sh | 2 +- packages/graphviz/build.sh | 2 +- packages/grep/build.sh | 4 ++-- packages/gst-plugins-bad/build.sh | 2 +- packages/gst-plugins-good/build.sh | 2 +- packages/gst-plugins-ugly/build.sh | 2 +- packages/gzip/build.sh | 2 +- packages/hexedit/build.sh | 2 +- packages/hfsutils/build.sh | 2 +- packages/hoedown/build.sh | 2 +- packages/htop/build.sh | 2 +- packages/httping/build.sh | 2 +- packages/httrack/build.sh | 2 +- packages/hunspell-en-us/build.sh | 2 +- packages/hunspell-ru/build.sh | 2 +- packages/hunspell/build.sh | 2 +- packages/hydra/build.sh | 2 +- packages/hyperfine/build.sh | 2 +- packages/icecast/build.sh | 2 +- packages/imgflo/build.sh | 2 +- packages/inotify-tools/build.sh | 2 +- packages/ired/build.sh | 2 +- packages/irssi/build.sh | 2 +- packages/jhead/build.sh | 2 +- packages/jq/build.sh | 2 +- packages/jsoncpp/build.sh | 2 +- packages/kakoune/build.sh | 2 +- packages/kona/build.sh | 2 +- packages/ldc/build.sh | 6 ++--- packages/ldns/build.sh | 2 +- packages/less/build.sh | 2 +- packages/lftp/build.sh | 2 +- packages/lhasa/build.sh | 2 +- packages/libandroid-glob/build.sh | 2 +- packages/libandroid-shmem/build.sh | 2 +- packages/libandroid-support/build.sh | 4 ++-- packages/libbsd/build.sh | 2 +- packages/libbz2/build.sh | 6 ++--- packages/libbz2/bzip2.subpackage.sh | 2 +- packages/libc++/build.sh | 2 +- packages/libcln/build.sh | 2 +- packages/libcurl/build.sh | 2 +- packages/libcurl/curl.subpackage.sh | 2 +- packages/libduktape/build.sh | 2 +- packages/libgnutls/build.sh | 2 +- packages/libgrpc/build.sh | 2 +- packages/libjansson/build.sh | 2 +- packages/libllvm/build.sh | 4 ++-- packages/liblua/build.sh | 2 +- packages/liblua52/build.sh | 2 +- packages/liblz4/build.sh | 2 +- packages/liblzma/build.sh | 2 +- packages/liblzma/xz-utils.subpackage.sh | 2 +- packages/libmesode/build.sh | 2 +- packages/libmsgpack/build.sh | 2 +- packages/libotr/build.sh | 2 +- packages/libpcap/build.sh | 2 +- packages/libprotobuf/build.sh | 2 +- packages/librsync/build.sh | 2 +- packages/libsoxr/build.sh | 2 +- packages/libtalloc/build.sh | 4 ++-- packages/libtermkey/build.sh | 2 +- packages/libunibilium/build.sh | 2 +- packages/libunwind/build.sh | 2 +- packages/libvpx/build.sh | 2 +- packages/libvterm/build.sh | 2 +- packages/libzopfli/build.sh | 2 +- packages/lldb/build.sh | 2 +- packages/luarocks/build.sh | 4 ++-- packages/make/build.sh | 4 ++-- packages/man/build.sh | 2 +- packages/mariadb/build.sh | 2 +- packages/mathomatic/build.sh | 2 +- packages/mc/build.sh | 2 +- packages/mdp/build.sh | 2 +- packages/megatools/build.sh | 2 +- packages/memcached/build.sh | 2 +- packages/mg/build.sh | 2 +- packages/mime-support/build.sh | 2 +- packages/mktorrent/build.sh | 2 +- packages/mpd/build.sh | 2 +- packages/multitail/build.sh | 2 +- packages/nano/build.sh | 2 +- packages/ncdc/build.sh | 2 +- packages/ncmpcpp/build.sh | 2 +- packages/ndk-multilib/build.sh | 2 +- packages/ndk-sysroot/build.sh | 2 +- packages/ne/build.sh | 2 +- packages/neofetch/build.sh | 4 ++-- packages/netpbm/build.sh | 2 +- packages/newsboat/build.sh | 2 +- packages/nginx/build.sh | 4 ++-- packages/nim/build.sh | 4 ++-- packages/ninja/build.sh | 2 +- packages/nmap/build.sh | 2 +- packages/nnn/build.sh | 2 +- packages/nodejs-lts/build.sh | 2 +- packages/nodejs/build.sh | 2 +- packages/notmuch/build.sh | 2 +- packages/nyancat/build.sh | 2 +- packages/nzbget/build.sh | 2 +- packages/oathtool/build.sh | 2 +- packages/odt2txt/build.sh | 2 +- packages/openjpeg/build.sh | 2 +- packages/openssh/build.sh | 2 +- packages/openssl/build.sh | 4 ++-- packages/optipng/build.sh | 2 +- packages/opusfile/build.sh | 2 +- packages/ossp-uuid/build.sh | 2 +- packages/p7zip/build.sh | 2 +- packages/par2/build.sh | 2 +- packages/parallel/build.sh | 2 +- packages/pass-otp/build.sh | 4 ++-- packages/pass/build.sh | 4 ++-- packages/pastebinit/build.sh | 6 ++--- packages/patchelf/build.sh | 2 +- packages/pathpicker/build.sh | 4 ++-- packages/perl/build.sh | 4 ++-- packages/pforth/build.sh | 2 +- packages/pick/build.sh | 2 +- packages/picolisp/build.sh | 2 +- packages/pkg-config/build.sh | 2 +- packages/play-audio/build.sh | 2 +- packages/postgresql/build.sh | 4 ++-- packages/privoxy/build.sh | 4 ++-- packages/procps/build.sh | 4 ++-- packages/profanity/build.sh | 2 +- packages/proxychains-ng/build.sh | 4 ++-- packages/psmisc/build.sh | 4 ++-- packages/radare2/build.sh | 4 ++-- packages/ranger/build.sh | 4 ++-- packages/rcs/build.sh | 2 +- packages/redir/build.sh | 2 +- packages/redis/build.sh | 2 +- packages/remind/build.sh | 2 +- packages/ripgrep/build.sh | 2 +- packages/root-repo/build.sh | 2 +- packages/rtmpdump/build.sh | 2 +- packages/sc-im/build.sh | 2 +- packages/sc/build.sh | 2 +- packages/science-repo/build.sh | 2 +- packages/screenfetch/build.sh | 4 ++-- packages/seafile-client/build.sh | 2 +- packages/sed/build.sh | 4 ++-- packages/sensible-utils/build.sh | 2 +- packages/serf/build.sh | 2 +- packages/shellharden/build.sh | 2 +- packages/sl/build.sh | 2 +- packages/socat/build.sh | 2 +- packages/stag/build.sh | 2 +- packages/stfl/build.sh | 2 +- packages/stow/build.sh | 4 ++-- packages/swig/build.sh | 2 +- packages/tar/build.sh | 2 +- packages/termux-am/build.sh | 4 ++-- packages/termux-api/build.sh | 2 +- packages/termux-apt-repo/build.sh | 4 ++-- packages/termux-create-package/build.sh | 4 ++-- packages/termux-elf-cleaner/build.sh | 2 +- packages/termux-exec/build.sh | 4 ++-- packages/termux-keyring/build.sh | 2 +- packages/termux-licenses/build.sh | 4 ++-- packages/termux-services/build.sh | 4 ++-- packages/termux-tools/build.sh | 4 ++-- packages/texlive-tlmgr/build.sh | 6 ++--- packages/texlive/build.sh | 6 ++--- packages/tig/build.sh | 2 +- packages/tintin++/build.sh | 2 +- packages/tinyscheme/build.sh | 2 +- packages/tmux/build.sh | 2 +- packages/toilet/build.sh | 2 +- packages/tracepath/build.sh | 2 +- packages/tree/build.sh | 2 +- packages/tsocks/build.sh | 2 +- packages/tsu/build.sh | 4 ++-- packages/tty-clock/build.sh | 2 +- packages/ttyrec/build.sh | 2 +- packages/units/build.sh | 2 +- packages/unrar/build.sh | 2 +- packages/unstable-repo/build.sh | 2 +- packages/unzip/build.sh | 2 +- packages/utf8cpp/build.sh | 2 +- packages/utf8proc/build.sh | 2 +- packages/vcsh/build.sh | 4 ++-- packages/vifm/build.sh | 2 +- packages/vim-python/build.sh | 4 ++-- packages/vim/build.sh | 4 ++-- packages/w3m/build.sh | 2 +- packages/wireguard-tools/build.sh | 2 +- packages/wordgrinder/build.sh | 2 +- packages/x11-repo/build.sh | 2 +- packages/xmlstarlet/build.sh | 2 +- packages/xorriso/build.sh | 2 +- packages/xvidcore/build.sh | 4 ++-- packages/yarn/build.sh | 4 ++-- packages/zile/build.sh | 2 +- packages/zip/build.sh | 2 +- packages/zsh/build.sh | 4 ++-- packages/zstd/build.sh | 2 +- .../build/configure/termux_step_configure.sh | 2 +- .../termux_step_configure_autotools.sh | 2 +- .../configure/termux_step_configure_cmake.sh | 4 ++-- scripts/build/setup/termux_setup_cmake.sh | 2 +- scripts/build/setup/termux_setup_golang.sh | 2 +- scripts/build/setup/termux_setup_ninja.sh | 2 +- scripts/build/setup/termux_setup_protobuf.sh | 2 +- scripts/build/setup/termux_setup_rust.sh | 2 +- scripts/build/termux_create_subpackages.sh | 8 +++---- scripts/build/termux_download_deb.sh | 2 +- scripts/build/termux_extract_dep_info.sh | 10 ++++----- scripts/build/termux_get_repo_files.sh | 2 +- scripts/build/termux_step_create_debfile.sh | 4 ++-- scripts/build/termux_step_handle_buildarch.sh | 2 +- scripts/build/termux_step_handle_hostbuild.sh | 2 +- scripts/build/termux_step_massage.sh | 2 +- scripts/build/termux_step_patch_package.sh | 2 +- scripts/build/termux_step_setup_toolchain.sh | 8 +++---- scripts/build/termux_step_setup_variables.sh | 22 +++++++++---------- scripts/build/termux_step_start_build.sh | 18 +++++++-------- scripts/buildorder.py | 2 +- 302 files changed, 413 insertions(+), 412 deletions(-) diff --git a/build-package.sh b/build-package.sh index b948098fc7..e05a0834de 100755 --- a/build-package.sh +++ b/build-package.sh @@ -16,7 +16,7 @@ if [ "$(uname -o)" = "Android" ] || [ -e "/system/bin/app_process" ]; then # is performed on device. export TERMUX_ON_DEVICE_BUILD=true else - export TERMUX_ON_DEVICE_BUILD= + export TERMUX_ON_DEVICE_BUILD=false fi # Lock file to prevent parallel running in the same environment. @@ -168,7 +168,7 @@ export TERMUX_SCRIPTDIR # shellcheck source=scripts/properties.sh . "$TERMUX_SCRIPTDIR/scripts/properties.sh" -if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then +if $TERMUX_ON_DEVICE_BUILD; then # For on device builds cross compiling is not supported. # Target architecture must be same as for environment used currently. export TERMUX_ARCH=$(dpkg --print-architecture) @@ -180,11 +180,11 @@ _show_usage() { echo "Build a package by creating a .deb file in the debs/ folder." echo echo "Available options:" - [ -z "$TERMUX_ON_DEVICE_BUILD" ] && echo " -a The architecture to build for: aarch64(default), arm, i686, x86_64 or all." + ! $TERMUX_ON_DEVICE_BUILD && 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/." echo " -f Force build even if package has already been built." - [ -z "$TERMUX_ON_DEVICE_BUILD" ] && echo " -i Download and extract dependencies instead of building them." + ! $TERMUX_ON_DEVICE_BUILD && echo " -i Download and extract dependencies instead of building them." echo " -I Download and extract dependencies instead of building them, keep existing /data/data/com.termux files." echo " -q Quiet build." echo " -s Skip dependency check." @@ -195,7 +195,7 @@ _show_usage() { while getopts :a:hdDfiIqso: option; do case "$option" in a) - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "./build-package.sh: option '-a' is not available for on-device builds" else export TERMUX_ARCH="$OPTARG" @@ -206,7 +206,7 @@ while getopts :a:hdDfiIqso: option; do D) local TERMUX_IS_DISABLED=true;; f) TERMUX_FORCE_BUILD=true;; i) - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "./build-package.sh: option '-i' is not available for on-device builds" else export TERMUX_INSTALL_DEPS=true @@ -236,7 +236,7 @@ while (($# > 0)); do fi # Handle 'all' arch: - if [ -z "$TERMUX_ON_DEVICE_BUILD" ] && [ -n "${TERMUX_ARCH+x}" ] && [ "${TERMUX_ARCH}" = 'all' ]; then + if ! $TERMUX_ON_DEVICE_BUILD && [ -n "${TERMUX_ARCH+x}" ] && [ "${TERMUX_ARCH}" = 'all' ]; then for arch in 'aarch64' 'arm' 'i686' 'x86_64'; do env TERMUX_ARCH="$arch" TERMUX_BUILD_IGNORE_LOCK=true ./build-package.sh \ ${TERMUX_FORCE_BUILD+-f} ${TERMUX_INSTALL_DEPS+-i} ${TERMUX_IS_DISABLED+-D} \ diff --git a/clean.sh b/clean.sh index 67da1666ef..5df2b78d01 100755 --- a/clean.sh +++ b/clean.sh @@ -8,10 +8,10 @@ set -e -u if [ "$(uname -o)" = "Android" ] || [ -e "/system/bin/app_process" ]; then TERMUX_ON_DEVICE_BUILD=true else - TERMUX_ON_DEVICE_BUILD= + TERMUX_ON_DEVICE_BUILD=false fi -if [ "$(id -u)" = "0" ] && [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then +if [ "$(id -u)" = "0" ] && $TERMUX_ON_DEVICE_BUILD; then echo "On-device execution of this script as root is disabled." exit 1 fi @@ -38,7 +38,7 @@ fi chmod +w -R "$TERMUX_TOPDIR" fi - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then # For on-device build cleanup /data shouldn't be erased. rm -Rf "$TERMUX_TOPDIR" else diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh index ae54147794..d73853a720 100644 --- a/packages/aapt/build.sh +++ b/packages/aapt/build.sh @@ -5,13 +5,13 @@ _TAG_VERSION=7.1.2 _TAG_REVISION=33 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION} TERMUX_PKG_REVISION=7 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libc++, libexpat, libpng, libzopfli, zlib" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/abduco/build.sh b/packages/abduco/build.sh index ab7c01c96d..e77b44901c 100644 --- a/packages/abduco/build.sh +++ b/packages/abduco/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.6 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.brain-dump.org/projects/abduco/abduco-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=c90909e13fa95770b5afc3b59f311b3d3d2fdfae23f9569fa4f96a3e192a35f4 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="dvtm" termux_step_pre_configure() { diff --git a/packages/abuild/build.sh b/packages/abuild/build.sh index c0e31ec95c..c14ad1869c 100644 --- a/packages/abuild/build.sh +++ b/packages/abuild/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/alpinelinux/abuild/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=f6f704e34f9d388a0228b645050dc7db7bf92f15a088835ae2c9b244420b9b61 TERMUX_PKG_DEPENDS="apk-tools, autoconf, automake, bash, clang, curl, libtool, make, openssl-tool, pkg-config, tar, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS="sysconfdir=$TERMUX_PREFIX/etc" TERMUX_PKG_CONFFILES="etc/abuild.conf" diff --git a/packages/ack-grep/build.sh b/packages/ack-grep/build.sh index 73aaba7170..a186dd166a 100644 --- a/packages/ack-grep/build.sh +++ b/packages/ack-grep/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SRCURL=https://beyondgrep.com/ack-v${TERMUX_PKG_VERSION} TERMUX_PKG_SHA256=8e49c66019af3a5bf5bce23c005231b2980e93889aa047ee54d857a75ab4a062 TERMUX_PKG_DEPENDS="perl" TERMUX_PKG_SKIP_SRC_EXTRACT=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { termux_download \ diff --git a/packages/alpine/build.sh b/packages/alpine/build.sh index aaf588c117..396e3d5d9a 100644 --- a/packages/alpine/build.sh +++ b/packages/alpine/build.sh @@ -15,7 +15,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-system-pinerc=${TERMUX_PREFIX}/etc/pine.conf --with-passfile=$TERMUX_ANDROID_HOME/.pine-passfile " -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { export TCC=$CC diff --git a/packages/apache2/build.sh b/packages/apache2/build.sh index 06fa038c45..fc65d75d43 100644 --- a/packages/apache2/build.sh +++ b/packages/apache2/build.sh @@ -75,7 +75,7 @@ TERMUX_PKG_EXTRA_MAKE_ARGS="-s" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/apk-tools/build.sh b/packages/apk-tools/build.sh index 5ef2f51759..6ac991fe76 100644 --- a/packages/apk-tools/build.sh +++ b/packages/apk-tools/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.10.4 TERMUX_PKG_SRCURL=https://github.com/alpinelinux/apk-tools/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=c08aa725a0437a6a83c5364a1a3a468e4aef5d1d09523369074779021397281c TERMUX_PKG_DEPENDS="openssl, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS="LUAAPK=" TERMUX_PKG_CONFFILES="etc/apk/repositories" diff --git a/packages/apksigner/build.sh b/packages/apksigner/build.sh index 2194231ea5..765d7ea793 100644 --- a/packages/apksigner/build.sh +++ b/packages/apksigner/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.7 TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=340560c4f75af3501f037452bcf184fa48fd18bc877a4cce9a51a3fa047b4b38 TERMUX_PKG_SRCURL=https://github.com/fornwall/apksigner/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make() { diff --git a/packages/apr/build.sh b/packages/apr/build.sh index e89c85d44c..47e33bdebd 100644 --- a/packages/apr/build.sh +++ b/packages/apr/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7 TERMUX_PKG_DEPENDS="libuuid" TERMUX_PKG_BREAKS="apr-dev" TERMUX_PKG_REPLACES="apr-dev" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true # "ac_cv_search_crypt=" to avoid needlessly linking to libcrypt. TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-installbuilddir=$TERMUX_PREFIX/share/apr-1/build diff --git a/packages/apt/build.sh b/packages/apt/build.sh index d2ae0d53cc..7a8be794c4 100644 --- a/packages/apt/build.sh +++ b/packages/apt/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_CONFLICTS="apt-transport-https" TERMUX_PKG_REPLACES="apt-transport-https" TERMUX_PKG_RECOMMENDS="game-repo, science-repo" TERMUX_PKG_SUGGESTS="unstable-repo" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_CONFFILES=" etc/apt/sources.list @@ -46,7 +46,7 @@ lib/libapt-inst.so termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/argp/build.sh b/packages/argp/build.sh index b8c8e5d598..d98a728a71 100644 --- a/packages/argp/build.sh +++ b/packages/argp/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.3 TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be TERMUX_PKG_SRCURL=https://www.lysator.liu.se/~nisse/misc/argp-standalone-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_NO_STATICSPLIT=yes +TERMUX_PKG_NO_STATICSPLIT=true termux_step_post_make_install() { cp libargp.a $TERMUX_PREFIX/lib diff --git a/packages/asciinema/build.sh b/packages/asciinema/build.sh index 3c576c136e..207fbc849c 100644 --- a/packages/asciinema/build.sh +++ b/packages/asciinema/build.sh @@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=2.0.2 TERMUX_PKG_SHA256=2578a1b5611e5375771ef6582a6533ef8d40cdbed1ba1c87786fd23af625ab68 TERMUX_PKG_SRCURL=https://github.com/asciinema/asciinema/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes -TERMUX_PKG_HAS_DEBUG=no +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true +TERMUX_PKG_HAS_DEBUG=false # ncurses-utils for tput which asciinema uses: TERMUX_PKG_DEPENDS="python, ncurses-utils" diff --git a/packages/attr/build.sh b/packages/attr/build.sh index 5bf07bc95b..0d1c882137 100644 --- a/packages/attr/build.sh +++ b/packages/attr/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/attr/attr-${TERMUX_P TERMUX_PKG_SHA256=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 TERMUX_PKG_BREAKS="attr-dev" TERMUX_PKG_REPLACES="attr-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gettext=no" # TERMUX_PKG_MAKE_INSTALL_TARGET="install install-lib" # attr.5 man page is in linux-man-pages: diff --git a/packages/autoconf/build.sh b/packages/autoconf/build.sh index 959422d883..0341fcacef 100644 --- a/packages/autoconf/build.sh +++ b/packages/autoconf/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.69 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/autoconf/autoconf-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 TERMUX_PKG_DEPENDS="m4, make, perl" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_post_extract_package() { perl -p -i -e "s|/bin/sh|$TERMUX_PREFIX/bin/sh|" lib/*/*.m4 diff --git a/packages/automake/build.sh b/packages/automake/build.sh index 0c75c8d691..e3fcf04861 100644 --- a/packages/automake/build.sh +++ b/packages/automake/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_VERSION=1.16.1 TERMUX_PKG_SHA256=5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/automake/automake-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="autoconf" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/autossh/build.sh b/packages/autossh/build.sh index 381dd40138..058fdf7d79 100644 --- a/packages/autossh/build.sh +++ b/packages/autossh/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.4g TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=83766463763364a1be56d6bf1a75b40a59302586645bf0c4fa885188cf01ebfc TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/autossh-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="openssh | dropbear" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man ac_cv_path_ssh=$TERMUX_PREFIX/bin/ssh" diff --git a/packages/bash-completion/build.sh b/packages/bash-completion/build.sh index 240558888e..7be3f66e81 100644 --- a/packages/bash-completion/build.sh +++ b/packages/bash-completion/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_VERSION=2.9 TERMUX_PKG_SHA256=d48fe378e731062f479c5f8802ffa9d3c40a275a19e6e0f6f6cc4b90fa12b2f5 TERMUX_PKG_SRCURL=https://github.com/scop/bash-completion/releases/download/${TERMUX_PKG_VERSION}/bash-completion-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="bash" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/bat/build.sh b/packages/bat/build.sh index 06229054bf..3caabdfb3c 100644 --- a/packages/bat/build.sh +++ b/packages/bat/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=bb4e39efadfab71c0c929a92b82dac58deacfe2a4eb527d4256ac0634e042e TERMUX_PKG_SRCURL=https://github.com/sharkdp/bat/archive/v$TERMUX_PKG_VERSION.tar.gz # bat calls less with '--RAW-CONTROL-CHARS' which busybox less does not support: TERMUX_PKG_DEPENDS="less, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CFLAGS="$CFLAGS $CPPFLAGS" diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh index 8509a25ac3..8790ec1561 100644 --- a/packages/binutils/build.sh +++ b/packages/binutils/build.sh @@ -11,8 +11,8 @@ TERMUX_PKG_REPLACES="binutils-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gold --enable-plugins --disable-werror --with-system-zlib --enable-new-dtags" TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX" TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/windmc.1 share/man/man1/windres.1 bin/ld.bfd" -TERMUX_PKG_NO_STATICSPLIT=yes -TERMUX_PKG_HAS_DEBUG=no +TERMUX_PKG_NO_STATICSPLIT=true +TERMUX_PKG_HAS_DEBUG=false # Debug build fails with: # ~/termux-build/binutils/src/binutils/readelf.c:19060:81: error: in call to 'fread', size * count is too large for the given buffer # if (fread (ehdr32.e_type, sizeof (ehdr32) - EI_NIDENT, 1, filedata->handle) != 1) diff --git a/packages/bison/build.sh b/packages/bison/build.sh index c9b6f39568..d89c1ceac7 100644 --- a/packages/bison/build.sh +++ b/packages/bison/build.sh @@ -5,5 +5,5 @@ TERMUX_PKG_VERSION=3.4.1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bison/bison-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=27159ac5ebf736dffd5636fd2cd625767c9e437de65baa63cb0de83570bd820d TERMUX_PKG_DEPENDS="m4" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="M4=m4" diff --git a/packages/bmon/build.sh b/packages/bmon/build.sh index 400ad91b49..62f0a77f3f 100644 --- a/packages/bmon/build.sh +++ b/packages/bmon/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/tgraf/bmon/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=d5e503ff6b116c681ebf4d10e238604dde836dceb9c0008eb92416a96c87ca40 TERMUX_PKG_DEPENDS="libconfuse, libnl, ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { ./autogen.sh diff --git a/packages/boost/build.sh b/packages/boost/build.sh index 2a7778a01c..e47926d581 100644 --- a/packages/boost/build.sh +++ b/packages/boost/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.70.0 TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://dl.bintray.com/boostorg/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2 TERMUX_PKG_SHA256=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib" TERMUX_PKG_BUILD_DEPENDS="python, python2" TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2), boost-dev" @@ -14,7 +14,7 @@ TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2), boost-dev" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/brotli/build.sh b/packages/brotli/build.sh index d84466535d..40590851a3 100644 --- a/packages/brotli/build.sh +++ b/packages/brotli/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee TERMUX_PKG_BREAKS="brotli-dev" TERMUX_PKG_REPLACES="brotli-dev" TERMUX_PKG_SRCURL=https://github.com/google/brotli/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_FORCE_CMAKE=yes +TERMUX_PKG_FORCE_CMAKE=true termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/share/man/man{1,3} diff --git a/packages/build-essential/build.sh b/packages/build-essential/build.sh index 5f0fd1215b..b7cd98057d 100644 --- a/packages/build-essential/build.sh +++ b/packages/build-essential/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=3.1 TERMUX_PKG_REVISION=3 TERMUX_PKG_METAPACKAGE=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true # # Common utilities for various build systems: diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index 6c6dda0a34..28423b6921 100644 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.30.1 TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true # We replace env in the old coreutils package: TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)" @@ -13,7 +13,7 @@ TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi @@ -31,8 +31,8 @@ termux_step_configure() { } termux_step_post_make_install() { - if [ "$TERMUX_DEBUG" == "true" ]; then - install busybox_unstripped $PREFIX/bin/busybox + if $TERMUX_DEBUG; then + install -Dm700 busybox_unstripped $PREFIX/bin/busybox fi # Utilities diff, mv, rm, rmdir are necessary to assist with package upgrading diff --git a/packages/bvi/build.sh b/packages/bvi/build.sh index 4827c7dc98..74e0c34268 100644 --- a/packages/bvi/build.sh +++ b/packages/bvi/build.sh @@ -6,6 +6,6 @@ TERMUX_PKG_VERSION=1.4.0 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://sourceforge.net/projects/bvi/files/bvi/${TERMUX_PKG_VERSION}/bvi-${TERMUX_PKG_VERSION}.src.tar.gz TERMUX_PKG_SHA256=015a3c2832c7c097d98a5527deef882119546287ba8f2a70c736227d764ef802 -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_ncursesw6_addnwstr=yes" TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps" diff --git a/packages/byobu/build.sh b/packages/byobu/build.sh index 10bbea0cb9..0f17749b5c 100644 --- a/packages/byobu/build.sh +++ b/packages/byobu/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_VERSION=5.129 TERMUX_PKG_SRCURL=https://launchpad.net/byobu/trunk/${TERMUX_PKG_VERSION}/+download/byobu_${TERMUX_PKG_VERSION}.orig.tar.gz TERMUX_PKG_SHA256=e5135f20750c359b6371ee87cf2729c6038fbf3a6e66680e67f6a2125b07c2b9 TERMUX_PKG_DEPENDS="gawk, tmux" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/c-ares/build.sh b/packages/c-ares/build.sh index 33982a9cf5..56ab426a23 100644 --- a/packages/c-ares/build.sh +++ b/packages/c-ares/build.sh @@ -8,5 +8,5 @@ TERMUX_PKG_SHA256=7deb7872cbd876c29036d5f37e30c4cbc3cc068d59d8b749ef85bb0736649f TERMUX_PKG_BREAKS="c-ares-dev" TERMUX_PKG_REPLACES="c-ares-dev" # Build with cmake to install cmake/c-ares/*.cmake files: -TERMUX_PKG_FORCE_CMAKE=yes +TERMUX_PKG_FORCE_CMAKE=true TERMUX_PKG_RM_AFTER_INSTALL="bin/" diff --git a/packages/ca-certificates/build.sh b/packages/ca-certificates/build.sh index 73114e55ef..eccdb912eb 100644 --- a/packages/ca-certificates/build.sh +++ b/packages/ca-certificates/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SRCURL=https://curl.haxx.se/ca/cacert.pem # If the checksum has changed, it may be time to update the package version: TERMUX_PKG_SHA256=cb2eca3fbfa232c9e3874e3852d43b33589f27face98eef10242a853d83a437a TERMUX_PKG_SKIP_SRC_EXTRACT=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { local CERTDIR=$TERMUX_PREFIX/etc/tls diff --git a/packages/cava/build.sh b/packages/cava/build.sh index 6367af6aaa..3986cdaa4c 100644 --- a/packages/cava/build.sh +++ b/packages/cava/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=98b880e7e704ed457863f379f31b488e06076bb34a5de02825096969b916a7 TERMUX_PKG_SRCURL=https://github.com/karlstav/cava/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="ncurses,fftw,libpulseaudio" TERMUX_PKG_BUILD_DEPENDS="libtool" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { ./autogen.sh diff --git a/packages/cboard/build.sh b/packages/cboard/build.sh index 4831b10a99..a2be4371a0 100644 --- a/packages/cboard/build.sh +++ b/packages/cboard/build.sh @@ -9,7 +9,8 @@ TERMUX_PKG_DEPENDS="libandroid-support,libandroid-glob,gnuchess, ncurses, ncurse termux_step_pre_configure() { CFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX" LDFLAGS+=" -landroid-glob" - if [ "$TERMUX_DEBUG" == "true" ]; then + + if $TERMUX_DEBUG; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives this error: # /home/builder/.termux-build/cboard/src/libchess/pgn.c:2235:33: error: 'umask' called with invalid mode # mode = umask(600); diff --git a/packages/ccnet/build.sh b/packages/ccnet/build.sh index 955b862171..5c2b3072d6 100644 --- a/packages/ccnet/build.sh +++ b/packages/ccnet/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=b55636bf95232dc1db70d3604d0bebb7c3d730292d15b9b6c5b951307eb697 TERMUX_PKG_DEPENDS="libuuid, libevent, libsearpc, libsqlite, openssl" TERMUX_PKG_BREAKS="ccnet-dev" TERMUX_PKG_REPLACES="ccnet-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { ./autogen.sh diff --git a/packages/cgdb/build.sh b/packages/cgdb/build.sh index c450fd6ae0..63fd234cb6 100644 --- a/packages/cgdb/build.sh +++ b/packages/cgdb/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423 TERMUX_PKG_DEPENDS="libc++, ncurses, readline, gdb" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_lib_ncursesw6_addnwstr=yes ac_cv_file__dev_ptmx=yes ac_cv_func_setpgrp_void=true ac_cv_rl_version=7 diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh index c7f5d4c9b3..7f92d7e418 100644 --- a/packages/cmake/build.sh +++ b/packages/cmake/build.sh @@ -6,5 +6,5 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06 TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib" -TERMUX_PKG_FORCE_CMAKE=yes +TERMUX_PKG_FORCE_CMAKE=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON" diff --git a/packages/cmus/build.sh b/packages/cmus/build.sh index 694b67bd46..f2289579a1 100644 --- a/packages/cmus/build.sh +++ b/packages/cmus/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=3 TERMUX_PKG_DEPENDS="libandroid-support, libiconv, ncurses, pulseaudio, ffmpeg, libmad, opusfile, libflac, libvorbis" TERMUX_PKG_SRCURL=https://github.com/cmus/cmus/archive/2748d40bb670558b523d5b47b4af442e82c7ffd2.tar.gz TERMUX_PKG_SHA256=37b5a1889a97cdfd319880bc5925c179119330163315dc3f408145c66d352f6b -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { LD=$CC diff --git a/packages/colordiff/build.sh b/packages/colordiff/build.sh index c3336f511a..25a55702de 100644 --- a/packages/colordiff/build.sh +++ b/packages/colordiff/build.sh @@ -7,8 +7,8 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.colordiff.org/colordiff-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0 TERMUX_PKG_DEPENDS="perl" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make() { # Skip the 'make' invocation as it only tries to diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh index 04c54c2932..342fcda7b6 100644 --- a/packages/coreutils/build.sh +++ b/packages/coreutils/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9 TERMUX_PKG_DEPENDS="libandroid-support, libiconv" TERMUX_PKG_BREAKS="busybox (<< 1.30.1-4)" TERMUX_PKG_REPLACES="busybox (<< 1.30.1-4)" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true # pinky has no usage on Android. # df does not work either, let system binary prevail. @@ -30,7 +30,7 @@ termux_step_pre_configure() { # On device build is unsupported as it removes utility 'ln' (and maybe # something else) in the installation process. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/cowsay/build.sh b/packages/cowsay/build.sh index a0c3c6dc10..048c0bbe1d 100644 --- a/packages/cowsay/build.sh +++ b/packages/cowsay/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=3.04 TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/c/cowsay/cowsay_3.03+dfsg1.orig.tar.gz TERMUX_PKG_SHA256=10bae895d9afb2d720d2211db58f396352b00fe1386c369ca3608cbf6497b839 TERMUX_PKG_DEPENDS="perl" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { cd $TERMUX_PKG_SRCDIR diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh index 4ce108ab87..3aba9e1a5b 100644 --- a/packages/ctags/build.sh +++ b/packages/ctags/build.sh @@ -8,8 +8,8 @@ TERMUX_PKG_SHA256=479abda4686fafd11cae40f646c2b692cc0209783d233b2534b339b838af9a TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip TERMUX_PKG_DEPENDS="libiconv" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp" -TERMUX_PKG_BUILD_IN_SRC="yes" -TERMUX_PKG_HOSTBUILD="yes" +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_HOSTBUILD=true termux_step_post_extract_package() { export regcomp_works=yes diff --git a/packages/darkhttpd/build.sh b/packages/darkhttpd/build.sh index 49cd87a7bc..de359be375 100644 --- a/packages/darkhttpd/build.sh +++ b/packages/darkhttpd/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_MAINTAINER="David Paskevic @casept" TERMUX_PKG_SRCURL=https://fossies.org/linux/www/darkhttpd-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=2652bc7e3dab35fcb64453616771016017a135e4b263ef73a36d29662593d472 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CFLAGS+=" $LDFLAGS" diff --git a/packages/dart/build.sh b/packages/dart/build.sh index 53787fd422..4c4d315f71 100644 --- a/packages/dart/build.sh +++ b/packages/dart/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Dart is a general-purpose programming language" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.4.1 TERMUX_PKG_SKIP_SRC_EXTRACT=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true # Dart uses tar and gzip to extract downloaded packages. # Busybox-based versions of such utilities cause issues so diff --git a/packages/dash/build.sh b/packages/dash/build.sh index e147ce7799..c61024a9ca 100644 --- a/packages/dash/build.sh +++ b/packages/dash/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.5.10.2 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://gondor.apana.org.au/~herbert/dash/files/dash-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071 -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true termux_step_post_make_install() { # Symlink sh -> dash diff --git a/packages/dasm/build.sh b/packages/dasm/build.sh index c7fe815e34..87fe7ce02a 100644 --- a/packages/dasm/build.sh +++ b/packages/dasm/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.20.11 TERMUX_PKG_SHA256=a9330adae534aeffbfdb8b3ba838322b92e1e0bb24f24f05b0ffb0a656312f36 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/dasm-dillon/dasm-dillon/${TERMUX_PKG_VERSION}/dasm-${TERMUX_PKG_VERSION}-2014.03.04-source.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { cp $TERMUX_PKG_SRCDIR/bin/* $TERMUX_PREFIX/bin/ diff --git a/packages/datamash/build.sh b/packages/datamash/build.sh index 47e6090974..10e2a9281e 100644 --- a/packages/datamash/build.sh +++ b/packages/datamash/build.sh @@ -4,10 +4,10 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.4 TERMUX_PKG_SHA256=fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/datamash/datamash-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - if [ "$TERMUX_DEBUG" == "true" ]; then + if $TERMUX_DEBUG; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives this error: # /home/builder/.termux-build/_cache/19b-aarch64-24-v5/bin/../sysroot/usr/include/bits/fortify/stdio.h:51:53: error: use of undeclared identifier '__USE_FORTIFY_LEVEL' # return __builtin___vsnprintf_chk(dest, size, 0, __bos(dest), format, ap); diff --git a/packages/dcraw/build.sh b/packages/dcraw/build.sh index 6b5f360db3..72813e7e57 100644 --- a/packages/dcraw/build.sh +++ b/packages/dcraw/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=2890c3da2642cd44c5f3bfed2c9b2c1db83da5cec09cc17e0fa72e17541fb4b9 #TERMUX_PKG_SRCURL=http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://mirrors.dotsrc.org/pub/mirrors/exherbo/dcraw-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="littlecms, libjasper, libjpeg-turbo" termux_step_make_install() { diff --git a/packages/debootstrap/build.sh b/packages/debootstrap/build.sh index cdd3bb2110..6f6b626fd3 100644 --- a/packages/debootstrap/build.sh +++ b/packages/debootstrap/build.sh @@ -6,8 +6,8 @@ TERMUX_PKG_VERSION=1.0.115 TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e4811165e02b027feb6a299aa354bcecc351ba273db9f56b072e246ff2b1d4e8 TERMUX_PKG_DEPENDS="wget, proot, perl" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_post_make_install() { mkdir -p ${TERMUX_PREFIX}/share/man/man8/ diff --git a/packages/dialog/build.sh b/packages/dialog/build.sh index c0f4a6250d..c491da55d0 100644 --- a/packages/dialog/build.sh +++ b/packages/dialog/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncursesw --enable-widec --with-pkg-confi termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/diffutils/build.sh b/packages/diffutils/build.sh index aaa0e9ac54..d1817cf012 100644 --- a/packages/diffutils/build.sh +++ b/packages/diffutils/build.sh @@ -6,12 +6,12 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/diffutils/diffutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26 TERMUX_PKG_DEPENDS="libiconv" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_path_PR_PROGRAM=${TERMUX_PREFIX}/bin/pr" termux_step_pre_configure() { - if [ "$TERMUX_DEBUG" == "true" ]; then + if $TERMUX_DEBUG; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives an # error: use of undeclared identifier '__USE_FORTIFY_LEVEL' export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} diff --git a/packages/docbook-xml/build.sh b/packages/docbook-xml/build.sh index f4d7a3eca3..5e9b244038 100644 --- a/packages/docbook-xml/build.sh +++ b/packages/docbook-xml/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=4.5 TERMUX_PKG_REVISION=1 TERMUX_PKG_SKIP_SRC_EXTRACT=yes TERMUX_PKG_DEPENDS="libxml2-utils" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true termux_step_extract_package() { diff --git a/packages/dos2unix/build.sh b/packages/dos2unix/build.sh index 4140079e40..b6bed1b503 100644 --- a/packages/dos2unix/build.sh +++ b/packages/dos2unix/build.sh @@ -5,5 +5,5 @@ TERMUX_PKG_VERSION=7.4.0 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://waterlan.home.xs4all.nl/dos2unix/dos2unix-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libandroid-support" diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh index a4a6cdda1d..123de9806a 100644 --- a/packages/dpkg/build.sh +++ b/packages/dpkg/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296 TERMUX_PKG_DEPENDS="bzip2, coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib" TERMUX_PKG_BREAKS="dpkg-dev" TERMUX_PKG_REPLACES="dpkg-dev" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_lib_selinux_setexecfilecon=no diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index f54c1c9362..81128a1ced 100644 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644 TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="termux-auth, zlib" TERMUX_PKG_CONFLICTS="openssh" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-syslog --disable-utmp --disable-utmpx --disable-wtmp --disable-static" # Avoid linking to libcrypt for server password authentication: diff --git a/packages/dvtm/build.sh b/packages/dvtm/build.sh index 4364fc6a26..0a8b29c3ef 100644 --- a/packages/dvtm/build.sh +++ b/packages/dvtm/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.15 TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/martanne/dvtm/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=496eada13d8abaa8d772279746f78b0c6fed11b560599490f3e70ebc21197bf0 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="ncurses" termux_step_pre_configure() { diff --git a/packages/e2fsprogs/build.sh b/packages/e2fsprogs/build.sh index 84f653d729..8f8ed55d04 100644 --- a/packages/e2fsprogs/build.sh +++ b/packages/e2fsprogs/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$TERMUX_PKG_VERSION/e2fsprogs-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595 TERMUX_PKG_CONFFILES="etc/mke2fs.conf" -TERMUX_PKG_NO_STATICSPLIT=yes +TERMUX_PKG_NO_STATICSPLIT=true ## util-linux provides libblkid TERMUX_PKG_DEPENDS="libuuid, util-linux" diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh index 81e5dc6d9a..29e42b8eaa 100644 --- a/packages/ecj/build.sh +++ b/packages/ecj/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_CONFLICTS="ecj4.6" termux_step_extract_package() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh index 88468b4ce6..6eb2516c2c 100644 --- a/packages/emacs/build.sh +++ b/packages/emacs/build.sh @@ -33,7 +33,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_elf_elf_begin=no" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" gl_cv_func_dup2_works=no" # disable setrlimit function to make termux-am work from within emacs TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_setrlimit=no" -TERMUX_PKG_HOSTBUILD=yes +TERMUX_PKG_HOSTBUILD=true # Remove some irrelevant files: TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/images share/applications/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.icon bin/grep-changelog share/man/man1/grep-changelog.1.gz share/emacs/${TERMUX_PKG_VERSION}/etc/refcards share/emacs/${TERMUX_PKG_VERSION}/etc/tutorials/TUTORIAL.*" @@ -46,7 +46,7 @@ TERMUX_PKG_RM_AFTER_INSTALL+=" bin/ctags share/man/man1/ctags.1 share/man/man1/c termux_step_post_extract_package() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh index d192f5e389..2ca52413c3 100644 --- a/packages/erlang/build.sh +++ b/packages/erlang/build.sh @@ -6,9 +6,9 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=04c090b55ec4a01778e7e1a5b7fdf54012548ca72737965b7aa8c4d7878c92bc TERMUX_PKG_DEPENDS="openssl, ncurses, zlib" -TERMUX_PKG_NO_STATICSPLIT=yes -TERMUX_PKG_HOSTBUILD="yes" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_NO_STATICSPLIT=true +TERMUX_PKG_HOSTBUILD=true +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap" TERMUX_PKG_EXTRA_MAKE_ARGS="noboot" diff --git a/packages/espeak/build.sh b/packages/espeak/build.sh index 9498f6a31c..2dd70d6cfd 100644 --- a/packages/espeak/build.sh +++ b/packages/espeak/build.sh @@ -10,8 +10,8 @@ TERMUX_PKG_SHA256=cf7ed86850b99bafe819548c73a6651a74300980dd15f319ff22e2bd72ea20 TERMUX_PKG_BREAKS="espeak-dev" TERMUX_PKG_REPLACES="espeak-dev" TERMUX_PKG_SRCURL=https://github.com/espeak-ng/espeak-ng/releases/download/${TERMUX_PKG_VERSION}/espeak-ng-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_HOSTBUILD=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_RM_AFTER_INSTALL="lib/*ng-test*" # --without-async due to that using pthread_cancel(). TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-async" @@ -19,7 +19,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-async" termux_step_post_extract_package() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/exa/build.sh b/packages/exa/build.sh index 935443d7b6..1c20c81f89 100644 --- a/packages/exa/build.sh +++ b/packages/exa/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SRCURL=https://github.com/ogham/exa/archive/058b4a57bdb1e25cbdacc0fbd TERMUX_PKG_SHA256=9931ad1c593096e69a1f0f7615e3857b1d422b7e74f63408385c663aeb2c12db TERMUX_PKG_DEPENDS="zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--no-default-features --features default" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { rm $TERMUX_PKG_SRCDIR/Makefile diff --git a/packages/fbless/build.sh b/packages/fbless/build.sh index 48f232de50..dbf4dd18be 100644 --- a/packages/fbless/build.sh +++ b/packages/fbless/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://deb.debian.org/debian/pool/main/f/fbless/fbless_${TERMUX_PKG_VERSION}.orig.tar.gz TERMUX_PKG_SHA256=68ae914d141da913ed6ff1805a1739346c33756b64a9407c14e95e278452c362 TERMUX_PKG_DEPENDS="ncurses, python2" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { export PYTHONPATH="$TERMUX_PREFIX/lib/python2.7/site-packages/" diff --git a/packages/fd/build.sh b/packages/fd/build.sh index 881903448d..8a41070d49 100644 --- a/packages/fd/build.sh +++ b/packages/fd/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=7.3.0 TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=fbd48cc83c90a0ab09fc3bbe865708a3a528876a99f8304a17d07af7fb378170 TERMUX_PKG_SRCURL=https://github.com/sharkdp/fd/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/share/man/man1 diff --git a/packages/fdupes/build.sh b/packages/fdupes/build.sh index e67efbce23..00ac34d458 100644 --- a/packages/fdupes/build.sh +++ b/packages/fdupes/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.6.1 TERMUX_PKG_SRCURL=https://github.com/adrianlopezroche/fdupes/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=9d6b6fdb0b8419815b4df3bdfd0aebc135b8276c90bbbe78ebe6af0b88ba49ea -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { sed -i "s,PREFIX = /usr/local,PREFIX = ${TERMUX_PREFIX}," "$TERMUX_PKG_SRCDIR/Makefile" diff --git a/packages/figlet/build.sh b/packages/figlet/build.sh index f2ca827b01..2498e75d38 100644 --- a/packages/figlet/build.sh +++ b/packages/figlet/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.2.5 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { LD=$CC diff --git a/packages/file/build.sh b/packages/file/build.sh index 710222443f..115d797c70 100644 --- a/packages/file/build.sh +++ b/packages/file/build.sh @@ -10,4 +10,4 @@ TERMUX_PKG_BREAKS="file-dev" TERMUX_PKG_REPLACES="file-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_mmap_fixed_mapped=yes" TERMUX_PKG_EXTRA_MAKE_ARGS="FILE_COMPILE=$TERMUX_PKG_HOSTBUILD_DIR/src/file" -TERMUX_PKG_HOSTBUILD="yes" +TERMUX_PKG_HOSTBUILD=true diff --git a/packages/findutils/build.sh b/packages/findutils/build.sh index 06b2e7d462..134dbe8e10 100644 --- a/packages/findutils/build.sh +++ b/packages/findutils/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/findutils/findutils-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d TERMUX_PKG_DEPENDS="libandroid-support" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" gl_cv_func_fflush_stdin=yes diff --git a/packages/fish/build.sh b/packages/fish/build.sh index bca00a3b7d..8fb0f854a0 100644 --- a/packages/fish/build.sh +++ b/packages/fish/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=14728ccc6b8e053d01526ebbd0822ca4eb0235e6487e832ec1d0d22f139543 # fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line. # man is needed since fish calls apropos during command completion. TERMUX_PKG_DEPENDS="libc++, ncurses, libandroid-support, ncurses-utils, man, bc, pcre2" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_file__proc_self_stat=yes --without-included-pcre2 diff --git a/packages/fsmon/build.sh b/packages/fsmon/build.sh index 0b9264df5e..3bc5b559ec 100644 --- a/packages/fsmon/build.sh +++ b/packages/fsmon/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.5 TERMUX_PKG_SRCURL=https://github.com/nowsecure/fsmon/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=37ea1c83297976f5c7058637a328150dea57743d5eb55ebfc3a8075d262d67c2 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { make FANOTIFY_CFLAGS="-DHAVE_FANOTIFY=1 -DHAVE_SYS_FANOTIFY=0" diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh index d84a4152a5..5368b5d82c 100644 --- a/packages/fzf/build.sh +++ b/packages/fzf/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_DEPENDS="bash, findutils" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/game-repo/build.sh b/packages/game-repo/build.sh index f85a7b2aee..e5437d4bd4 100644 --- a/packages/game-repo/build.sh +++ b/packages/game-repo/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=1.1 TERMUX_PKG_DEPENDS="termux-keyring" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh index 1b6687c03b..c637af5a90 100644 --- a/packages/gawk/build.sh +++ b/packages/gawk/build.sh @@ -8,13 +8,13 @@ TERMUX_PKG_SHA256=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a7 TERMUX_PKG_DEPENDS="libandroid-support, libgmp, libmpfr, readline" TERMUX_PKG_BREAKS="gawk-dev" TERMUX_PKG_REPLACES="gawk-dev" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/gcal/build.sh b/packages/gcal/build.sh index 240cb9a7f1..635ffd423a 100644 --- a/packages/gcal/build.sh +++ b/packages/gcal/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_DEPENDS="ncurses" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh index 7e66899d5a..d18b5becfb 100644 --- a/packages/gdb/build.sh +++ b/packages/gdb/build.sh @@ -16,7 +16,7 @@ ac_cv_func_getpwnam=no " TERMUX_PKG_RM_AFTER_INSTALL="share/gdb/python share/gdb/syscalls share/gdb/system-gdbinit" TERMUX_PKG_MAKE_INSTALL_TARGET="-C gdb install" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { # Fix "undefined reference to 'rpl_gettimeofday'" when building: diff --git a/packages/getconf/build.sh b/packages/getconf/build.sh index 26c592bb01..b515dffbae 100644 --- a/packages/getconf/build.sh +++ b/packages/getconf/build.sh @@ -4,4 +4,4 @@ TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=0.5 TERMUX_PKG_SHA256=8192701051d2a2bf8d1ae7b1c0922c3f1d4a039b9ad99496636b0122667d595c TERMUX_PKG_SRCURL=https://github.com/termux/getconf/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/getmail/build.sh b/packages/getmail/build.sh index 8b48deb17f..54d3423baa 100644 --- a/packages/getmail/build.sh +++ b/packages/getmail/build.sh @@ -5,8 +5,8 @@ TERMUX_PKG_VERSION=5.13 TERMUX_PKG_SHA256=04d52f6475f09e9f99b4e3d2f1d2eb967a68b67f09af2a6a5151857f060b0a9d TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/getmail-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="python2" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { python2 setup.py install --prefix=$TERMUX_PREFIX --force diff --git a/packages/gettext/build.sh b/packages/gettext/build.sh index 29e400d462..b75be963eb 100644 --- a/packages/gettext/build.sh +++ b/packages/gettext/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a38 TERMUX_PKG_DEPENDS="libc++, libiconv, pcre, liblzma, libxml2, libcroco, ncurses, libunistring, zlib" TERMUX_PKG_BREAKS="gettext-dev" TERMUX_PKG_REPLACES="gettext-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { autoreconf diff --git a/packages/giflib/build.sh b/packages/giflib/build.sh index 57736f6a66..10ef0889a7 100644 --- a/packages/giflib/build.sh +++ b/packages/giflib/build.sh @@ -8,4 +8,4 @@ TERMUX_PKG_SHA256=31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879 TERMUX_PKG_BREAKS="giflib-dev" TERMUX_PKG_REPLACES="giflib-dev" TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/giflib-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/git/build.sh b/packages/git/build.sh index be5dec72ae..be9c38b170 100644 --- a/packages/git/build.sh +++ b/packages/git/build.sh @@ -26,7 +26,7 @@ NO_INSTALL_HARDLINKS=1 PERL_PATH=$TERMUX_PREFIX/bin/perl USE_LIBPCRE2=1 " -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true # Things to remove to save space: # bin/git-cvsserver - server emulating CVS @@ -43,7 +43,7 @@ share/man/man1/git-shell.1 termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh index 2173f88429..a0a8a369d9 100644 --- a/packages/gmic/build.sh +++ b/packages/gmic/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=2e5535d1bae66254136e928428750aac8efcef6f4413fc352b6de9ce8ac8b0ff TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib" TERMUX_PKG_BUILD_DEPENDS="graphicsmagick" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { return 0; diff --git a/packages/gnuplot/build.sh b/packages/gnuplot/build.sh index f18e0a14f1..5a04f87892 100644 --- a/packages/gnuplot/build.sh +++ b/packages/gnuplot/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/gnuplot/gnuplot/${TE TERMUX_PKG_SHA256=97fe503ff3b2e356fe2ae32203fc7fd2cf9cef1f46b60fe46dc501a228b9f4ed TERMUX_PKG_DEPENDS="libandroid-support, libc++, libiconv, readline, pango, libgd, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-lua=no --with-bitmap-terminals" -TERMUX_PKG_HOSTBUILD=yes +TERMUX_PKG_HOSTBUILD=true termux_step_host_build() { "$TERMUX_PKG_SRCDIR/configure" diff --git a/packages/golang/build.sh b/packages/golang/build.sh index 4ce69dd7ae..496d8d14eb 100644 --- a/packages/golang/build.sh +++ b/packages/golang/build.sh @@ -8,12 +8,12 @@ TERMUX_PKG_VERSION=2:${_MAJOR_VERSION} TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz TERMUX_PKG_DEPENDS="clang" -TERMUX_PKG_NO_STATICSPLIT=yes +TERMUX_PKG_NO_STATICSPLIT=true termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/gperf/build.sh b/packages/gperf/build.sh index 2d2d52f959..1dd9bea3c4 100644 --- a/packages/gperf/build.sh +++ b/packages/gperf/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gperf/gperf-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 TERMUX_PKG_DEPENDS="libc++" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh index dcf5f9fb57..8548c98b28 100644 --- a/packages/graphviz/build.sh +++ b/packages/graphviz/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, TERMUX_PKG_BREAKS="graphviz-dev" TERMUX_PKG_REPLACES="graphviz-dev" TERMUX_PKG_BUILD_DEPENDS="libtool" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-guile=no --enable-java=no diff --git a/packages/grep/build.sh b/packages/grep/build.sh index b95a61421b..24d12cc20a 100644 --- a/packages/grep/build.sh +++ b/packages/grep/build.sh @@ -6,10 +6,10 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/grep/grep-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514 TERMUX_PKG_DEPENDS="libandroid-support, pcre" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true termux_step_pre_configure() { - if [ "$TERMUX_DEBUG" == "true" ]; then + if $TERMUX_DEBUG; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives this error: # /home/builder/.termux-build/_cache/19b-aarch64-24-v5/bin/../sysroot/usr/include/bits/fortify/stdio.h:51:53: error: use of undeclared identifier '__USE_FORTIFY_LEVEL' # return __builtin___vsnprintf_chk(dest, size, 0, __bos(dest), format, ap); diff --git a/packages/gst-plugins-bad/build.sh b/packages/gst-plugins-bad/build.sh index 8f0402e3ad..96d34c4c9a 100644 --- a/packages/gst-plugins-bad/build.sh +++ b/packages/gst-plugins-bad/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b TERMUX_PKG_DEPENDS="gst-plugins-base, libbz2, libcurl, libiconv, libpng, librsvg, libssh2, libsndfile, libx264, libx265, littlecms, openal-soft, openjpeg" TERMUX_PKG_BREAKS="gst-plugins-bad-dev" TERMUX_PKG_REPLACES="gst-plugins-bad-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-android_media --disable-examples diff --git a/packages/gst-plugins-good/build.sh b/packages/gst-plugins-good/build.sh index 2f3343a81d..3ea00aa81b 100644 --- a/packages/gst-plugins-good/build.sh +++ b/packages/gst-plugins-good/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd TERMUX_PKG_DEPENDS="gst-plugins-base, libcaca, libsoup, libjpeg-turbo, libpng, libflac, libbz2, libvpx, libpulseaudio, libmp3lame, gstreamer, libogg, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true # pcre needed by glib. libxml2 needed by libsoup TERMUX_PKG_BUILD_DEPENDS="glib, pcre, libxml2" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/gst-plugins-ugly/build.sh b/packages/gst-plugins-ugly/build.sh index 8dcd2728e1..dac773b0dc 100644 --- a/packages/gst-plugins-ugly/build.sh +++ b/packages/gst-plugins-ugly/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.16.0 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=e30964c5f031c32289e0b25e176c3c95a5737f2052dfc81d0f7427ef0233a4c2 TERMUX_PKG_DEPENDS="gst-plugins-base, libx264" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-tests --disable-examples diff --git a/packages/gzip/build.sh b/packages/gzip/build.sh index 70bbf16bff..9a10e683f6 100644 --- a/packages/gzip/build.sh +++ b/packages/gzip/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.10 TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gzip/gzip-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0 -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_path_GREP=grep" diff --git a/packages/hexedit/build.sh b/packages/hexedit/build.sh index 6eaa5a4d66..b068dbc7d4 100644 --- a/packages/hexedit/build.sh +++ b/packages/hexedit/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.4.2 TERMUX_PKG_SHA256=c81ffb36af9243aefc0887e33dd8e41c4b22d091f1f27d413cbda443b0440d66 TERMUX_PKG_SRCURL=https://github.com/pixel/hexedit/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { ./autogen.sh diff --git a/packages/hfsutils/build.sh b/packages/hfsutils/build.sh index 9b5975bd32..c637a16b5a 100644 --- a/packages/hfsutils/build.sh +++ b/packages/hfsutils/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SRCURL=ftp://ftp.mars.org/pub/hfs/hfsutils-${TERMUX_PKG_VERSION}.tar. TERMUX_PKG_SHA256=bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840 TERMUX_PKG_DEPENDS="libandroid-support" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_configure() { mkdir -p ${TERMUX_PREFIX}/share/man/man1 diff --git a/packages/hoedown/build.sh b/packages/hoedown/build.sh index 0152aa2481..a6e24bee58 100644 --- a/packages/hoedown/build.sh +++ b/packages/hoedown/build.sh @@ -8,4 +8,4 @@ TERMUX_PKG_SRCURL=https://github.com/hoedown/hoedown/archive/$TERMUX_PKG_VERSION TERMUX_PKG_SHA256=01b6021b1ec329b70687c0d240b12edcaf09c4aa28423ddf344d2bd9056ba920 TERMUX_PKG_BREAKS="hoedown-dev" TERMUX_PKG_REPLACES="hoedown-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/htop/build.sh b/packages/htop/build.sh index 02c575581a..f233c9096d 100644 --- a/packages/htop/build.sh +++ b/packages/htop/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c TERMUX_PKG_SRCURL=http://hisham.hm/htop/releases/${TERMUX_PKG_VERSION}/htop-${TERMUX_PKG_VERSION}.tar.gz # htop checks setlocale() return value for UTF-8 support, so use libandroid-support. TERMUX_PKG_DEPENDS="ncurses, libandroid-support" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_lib_ncursesw6_addnwstr=yes diff --git a/packages/httping/build.sh b/packages/httping/build.sh index 1cc3e90f3e..dae689bc1b 100644 --- a/packages/httping/build.sh +++ b/packages/httping/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.5 TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://fossies.org/linux/www/httping-${TERMUX_PKG_VERSION}.tgz TERMUX_PKG_SHA256=3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="fftw, libandroid-support, ncurses, openssl" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-fftw3 --with-ncurses --with-openssl" TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff" diff --git a/packages/httrack/build.sh b/packages/httrack/build.sh index c1b96656c2..1600b47193 100644 --- a/packages/httrack/build.sh +++ b/packages/httrack/build.sh @@ -10,4 +10,4 @@ TERMUX_PKG_DEPENDS="libiconv, openssl, zlib" TERMUX_PKG_BREAKS="httrack-dev" TERMUX_PKG_REPLACES="httrack-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-zlib=$TERMUX_PREFIX LIBS=-liconv" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/hunspell-en-us/build.sh b/packages/hunspell-en-us/build.sh index de2e448791..a29964b9f2 100644 --- a/packages/hunspell-en-us/build.sh +++ b/packages/hunspell-en-us/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://hunspell.github.io TERMUX_PKG_DESCRIPTION="American english dictionary for hunspell" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_VERSION=20181025 -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/hunspell/ diff --git a/packages/hunspell-ru/build.sh b/packages/hunspell-ru/build.sh index e4ab66f92e..57668c4936 100644 --- a/packages/hunspell-ru/build.sh +++ b/packages/hunspell-ru/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://hunspell.github.io TERMUX_PKG_DESCRIPTION="Russian dictionary for hunspell" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_VERSION=20170303 -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/hunspell/ diff --git a/packages/hunspell/build.sh b/packages/hunspell/build.sh index d8c8ced72e..523b895438 100644 --- a/packages/hunspell/build.sh +++ b/packages/hunspell/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_DEPENDS="libc++, libiconv, ncurses, readline, hunspell-en-us" TERMUX_PKG_BREAKS="hunspell-dev" TERMUX_PKG_REPLACES="hunspell-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ui --with-readline" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { autoreconf -vfi diff --git a/packages/hydra/build.sh b/packages/hydra/build.sh index 45904e881c..06d8eb6985 100644 --- a/packages/hydra/build.sh +++ b/packages/hydra/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=9.0 TERMUX_PKG_SHA256=56672e253c128abaa6fb19e77f6f59ba6a93762a9ba435505a009ef6d58e8d0e TERMUX_PKG_SRCURL=https://github.com/vanhauser-thc/thc-hydra/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="openssl, pcre, libssh" termux_step_configure() { diff --git a/packages/hyperfine/build.sh b/packages/hyperfine/build.sh index 5b85d427b6..63f1034ff5 100644 --- a/packages/hyperfine/build.sh +++ b/packages/hyperfine/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_VERSION=1.6.0 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/sharkdp/hyperfine/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=0cb251453147421c0c807587123e733b32346b9756c8594018c637ec374a63f4 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/icecast/build.sh b/packages/icecast/build.sh index 9484f69af3..81ac0ff6bd 100644 --- a/packages/icecast/build.sh +++ b/packages/icecast/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.4.4 TERMUX_PKG_SRCURL=https://downloads.xiph.org/releases/icecast/icecast-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=49b5979f9f614140b6a38046154203ee28218d8fc549888596a683ad604e4d44 TERMUX_PKG_DEPENDS="libcurl, libgnutls, libogg, libvorbis, libxml2, libxslt, mime-support, openssl" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { perl -p -i -e "s#/etc/mime.types#$TERMUX_PREFIX/etc/mime.types#" $TERMUX_PKG_SRCDIR/src/cfgfile.c diff --git a/packages/imgflo/build.sh b/packages/imgflo/build.sh index 4bb67293fd..051bda36ac 100644 --- a/packages/imgflo/build.sh +++ b/packages/imgflo/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/imgflo/imgflo/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=4dd5fc9d34f3cfc294fd69a14d50ed5401abeb829132f1b1ac316e28223fc393 TERMUX_PKG_DEPENDS="gegl, libsoup, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/inotify-tools/build.sh b/packages/inotify-tools/build.sh index bcf704a732..62a0776ec3 100644 --- a/packages/inotify-tools/build.sh +++ b/packages/inotify-tools/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242 TERMUX_PKG_BREAKS="inotify-tools-dev" TERMUX_PKG_REPLACES="inotify-tools-dev" TERMUX_PKG_SRCURL=https://github.com/rvoicilas/inotify-tools/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { ./autogen.sh diff --git a/packages/ired/build.sh b/packages/ired/build.sh index 96966259fa..451c987114 100644 --- a/packages/ired/build.sh +++ b/packages/ired/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.6 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/radare/ired/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=c15d37b96b1a25c44435d824bd7ef1f9aea9dc191be14c78b689d3156312d58a -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CFLAGS+=" $LDFLAGS" diff --git a/packages/irssi/build.sh b/packages/irssi/build.sh index e4077bdd00..c1da2f96f8 100644 --- a/packages/irssi/build.sh +++ b/packages/irssi/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_VERSION=1.2.1 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/$TERMUX_PKG_VERSION/irssi-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=5466a1ed9612cfa707d9a37d60b29d027b4ac7d83c74ceb1a410e2b59edba92c -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" diff --git a/packages/jhead/build.sh b/packages/jhead/build.sh index 428a454072..970321d60e 100644 --- a/packages/jhead/build.sh +++ b/packages/jhead/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_VERSION=3.03 TERMUX_PKG_SHA256=82194e0128d9141038f82fadcb5845391ca3021d61bc00815078601619f6c0c2 TERMUX_PKG_SRCURL=http://www.sentex.net/~mwandel/jhead/jhead-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { install -Dm700 jhead $TERMUX_PREFIX/bin/jhead diff --git a/packages/jq/build.sh b/packages/jq/build.sh index 6b1c5cd113..0fc8baf7e7 100644 --- a/packages/jq/build.sh +++ b/packages/jq/build.sh @@ -8,4 +8,4 @@ TERMUX_PKG_BREAKS="jq-dev" TERMUX_PKG_REPLACES="jq-dev" TERMUX_PKG_SRCURL=https://github.com/stedolan/jq/releases/download/jq-$TERMUX_PKG_VERSION/jq-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-oniguruma=no" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh index 43fea6f694..cb95c6169e 100644 --- a/packages/jsoncpp/build.sh +++ b/packages/jsoncpp/build.sh @@ -18,7 +18,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/kakoune/build.sh b/packages/kakoune/build.sh index 72cb8c3534..7631a7d23c 100644 --- a/packages/kakoune/build.sh +++ b/packages/kakoune/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/mawww/kakoune/releases/download/v$TERMUX_PKG_VERSION/kakoune-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SHA256=8cf978499000bd71a78736eaee5663bd996f53c4e610c62a9bd97502a3ed6fd3 TERMUX_PKG_DEPENDS="libc++, ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src debug=no" termux_step_pre_configure() { diff --git a/packages/kona/build.sh b/packages/kona/build.sh index b6f9fdb603..c287658d63 100644 --- a/packages/kona/build.sh +++ b/packages/kona/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_MAINTAINER="Jonathan Badger @jhbadger" TERMUX_PKG_VERSION=20190226 TERMUX_PKG_SRCURL=https://github.com/kevinlawler/kona/archive/Win64-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=26cfebd47a3ae60753fc8a910132f45cad58381155255fbac2129e4507fef403 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index 2356f6ac46..e16162dabf 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -19,9 +19,9 @@ TERMUX_PKG_SHA256=(4b2fd3eb90fb6debc0ae6d70406bc78fcb531a0f20806640e626d4822e87b bd17cf67784f2ea0a2e0298761c662c80fddf6700c065f6689eb353e2144c987 3692974b6dc6c81280c0321371b400101006f28bafb890f089b1d357dadbcbf1) TERMUX_PKG_DEPENDS="clang, libc++, zlib" -TERMUX_PKG_NO_STATICSPLIT=yes +TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_HOSTBUILD=true -TERMUX_PKG_FORCE_CMAKE=yes +TERMUX_PKG_FORCE_CMAKE=true #These CMake args are only used to configure a patched LLVM TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLLVM_ENABLE_PIC=ON @@ -34,7 +34,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" termux_step_post_extract_package() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/ldns/build.sh b/packages/ldns/build.sh index 2687bd2771..a71f3bc4c1 100644 --- a/packages/ldns/build.sh +++ b/packages/ldns/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac2082 TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_BREAKS="ldns-dev" TERMUX_PKG_REPLACES="ldns-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-ssl=$TERMUX_PREFIX diff --git a/packages/less/build.sh b/packages/less/build.sh index 67f3a9743a..7af5f417cf 100644 --- a/packages/less/build.sh +++ b/packages/less/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.greenwoodsoftware.com/less/less-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh index 0c62f67ff7..dadfda6c9f 100644 --- a/packages/lftp/build.sh +++ b/packages/lftp/build.sh @@ -18,7 +18,7 @@ ac_cv_func_dn_expand=no " termux_step_pre_configure() { - if [ "$TERMUX_DEBUG" == "true" ]; then + if $TERMUX_DEBUG; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives this error: # /home/builder/.termux-build/_lib/16-aarch64-21-v3/bin/../sysroot/usr/include/bits/fortify/string.h:79:26: error: use of undeclared identifier '__USE_FORTIFY_LEVEL' export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} diff --git a/packages/lhasa/build.sh b/packages/lhasa/build.sh index 53fb65764f..f435be0ef6 100644 --- a/packages/lhasa/build.sh +++ b/packages/lhasa/build.sh @@ -8,4 +8,4 @@ TERMUX_PKG_SRCURL=https://soulsphere.org/projects/lhasa/lhasa-$TERMUX_PKG_VERSIO TERMUX_PKG_SHA256=3fb08e5f85a9b9dd023922896be9157d5fb5c0448424681810aaa2b0558a5f24 TERMUX_PKG_BREAKS="lhasa-dev" TERMUX_PKG_REPLACES="lhasa-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/libandroid-glob/build.sh b/packages/libandroid-glob/build.sh index 01cfb418c6..75156a5f3f 100644 --- a/packages/libandroid-glob/build.sh +++ b/packages/libandroid-glob/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=0.6 TERMUX_PKG_BREAKS="libandroid-glob-dev" TERMUX_PKG_REPLACES="libandroid-glob-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { $CC $CFLAGS $CPPFLAGS -I$TERMUX_PKG_BUILDER_DIR -c $TERMUX_PKG_BUILDER_DIR/glob.c diff --git a/packages/libandroid-shmem/build.sh b/packages/libandroid-shmem/build.sh index 7e459c90b2..8f039471ec 100644 --- a/packages/libandroid-shmem/build.sh +++ b/packages/libandroid-shmem/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-shmem/archive/v${TERMUX_P TERMUX_PKG_SHA256=09369398658af357e3644178d42ebfcc79ea11fe760b10855011521fc3e35be4 TERMUX_PKG_BREAKS="libandroid-shmem-dev" TERMUX_PKG_REPLACES="libandroid-shmem-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh index 3bf76f1594..9cbc3a4021 100644 --- a/packages/libandroid-support/build.sh +++ b/packages/libandroid-support/build.sh @@ -6,8 +6,8 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=42e7b55c2e5fc91cc0447fa8bea432e7a75ec78b03469330668af17aea56f660 TERMUX_PKG_PRE_DEPENDS="dpkg (>= 1.19.4-3)" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_ESSENTIAL=true termux_step_make() { local c_file diff --git a/packages/libbsd/build.sh b/packages/libbsd/build.sh index eb59160bf8..6b8f87e790 100644 --- a/packages/libbsd/build.sh +++ b/packages/libbsd/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_SRCURL=https://libbsd.freedesktop.org/releases/libbsd-$TERMUX_PKG_VER TERMUX_PKG_SHA256=34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887 TERMUX_PKG_BREAKS="libbsd-dev" TERMUX_PKG_REPLACES="libbsd-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/libbz2/build.sh b/packages/libbz2/build.sh index 3f42c1f940..e95be30524 100644 --- a/packages/libbz2/build.sh +++ b/packages/libbz2/build.sh @@ -7,14 +7,14 @@ TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar TERMUX_PKG_SHA256=47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f TERMUX_PKG_BREAKS="libbz2-dev" TERMUX_PKG_REPLACES="libbz2-dev" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/libbz2/bzip2.subpackage.sh b/packages/libbz2/bzip2.subpackage.sh index 02e2ae46e9..69a47b6b43 100644 --- a/packages/libbz2/bzip2.subpackage.sh +++ b/packages/libbz2/bzip2.subpackage.sh @@ -1,3 +1,3 @@ TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/" TERMUX_SUBPKG_DESCRIPTION="Tools for working with bzip2 compression" -TERMUX_SUBPKG_ESSENTIAL=yes +TERMUX_SUBPKG_ESSENTIAL=true diff --git a/packages/libc++/build.sh b/packages/libc++/build.sh index 7d047112c8..25eb5246e5 100644 --- a/packages/libc++/build.sh +++ b/packages/libc++/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://libcxx.llvm.org/ TERMUX_PKG_DESCRIPTION="C++ Standard Library" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true termux_step_post_make_install() { cp "$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${TERMUX_HOST_PLATFORM}/libc++_shared.so" $TERMUX_PREFIX/lib diff --git a/packages/libcln/build.sh b/packages/libcln/build.sh index d64496db2b..ba498c3894 100644 --- a/packages/libcln/build.sh +++ b/packages/libcln/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=c32e59b6afbcf8b84075ab454c42982429c6ea9675aee2bbda176cb85293e3 TERMUX_PKG_DEPENDS="libc++, libgmp" TERMUX_PKG_BREAKS="libcln-dev" TERMUX_PKG_REPLACES="libcln-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { if [ $TERMUX_ARCH = arm ]; then diff --git a/packages/libcurl/build.sh b/packages/libcurl/build.sh index 75848cde8c..b6e04f761e 100644 --- a/packages/libcurl/build.sh +++ b/packages/libcurl/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce5 TERMUX_PKG_DEPENDS="libnghttp2, openssl (>= 1.1.1), zlib" TERMUX_PKG_BREAKS="libcurl-dev" TERMUX_PKG_REPLACES="libcurl-dev" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-ntlm-wb=$TERMUX_PREFIX/bin/ntlm_auth diff --git a/packages/libcurl/curl.subpackage.sh b/packages/libcurl/curl.subpackage.sh index 2b79845c3b..d24d154de3 100644 --- a/packages/libcurl/curl.subpackage.sh +++ b/packages/libcurl/curl.subpackage.sh @@ -1,3 +1,3 @@ TERMUX_SUBPKG_INCLUDE="bin/curl share/man/man1/curl.1.gz" TERMUX_SUBPKG_DESCRIPTION="Command line tool for transferring data with URL syntax" -TERMUX_SUBPKG_ESSENTIAL=yes +TERMUX_SUBPKG_ESSENTIAL=true diff --git a/packages/libduktape/build.sh b/packages/libduktape/build.sh index 2317b705e9..a25fde662d 100644 --- a/packages/libduktape/build.sh +++ b/packages/libduktape/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=2.4.0 TERMUX_PKG_REPLACES="duktape (<< 2.3.0-1), libduktape-dev" TERMUX_PKG_BREAKS="duktape (<< 2.3.0-1), libduktape-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_extract_package() { git clone --depth=1 https://github.com/svaarala/duktape.git -b v${TERMUX_PKG_VERSION} ${TERMUX_PKG_SRCDIR} diff --git a/packages/libgnutls/build.sh b/packages/libgnutls/build.sh index cb8a71137a..f5c7027e94 100644 --- a/packages/libgnutls/build.sh +++ b/packages/libgnutls/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1f TERMUX_PKG_DEPENDS="libgmp, libnettle, ca-certificates, libidn2, libunistring" TERMUX_PKG_BREAKS="libgnutls-dev" TERMUX_PKG_REPLACES="libgnutls-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-cxx diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh index b3e2077b1d..ea97b85a91 100644 --- a/packages/libgrpc/build.sh +++ b/packages/libgrpc/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_BREAKS="libgrpc-dev" TERMUX_PKG_REPLACES="libgrpc-dev" TERMUX_PKG_BUILD_DEPENDS="libprotobuf" TERMUX_PKG_HOSTBUILD=true -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_STRIP=$(which strip) -DGIT_EXECUTABLE=$(which git) diff --git a/packages/libjansson/build.sh b/packages/libjansson/build.sh index d02a6dd0c7..d5c31872b6 100644 --- a/packages/libjansson/build.sh +++ b/packages/libjansson/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=76260d30e9bbd0ef392798525e8cd7fe59a6450c54ca6135672e3cd6a16429 TERMUX_PKG_BREAKS="libjansson-dev" TERMUX_PKG_REPLACES="libjansson-dev" TERMUX_PKG_SRCURL=https://github.com/akheron/jansson/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { autoreconf -fi diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index dea29b40de..08465ebaec 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -51,8 +51,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DPERL_EXECUTABLE=$(which perl) -DLLVM_ENABLE_FFI=ON " -TERMUX_PKG_FORCE_CMAKE=yes -TERMUX_PKG_HAS_DEBUG=no +TERMUX_PKG_FORCE_CMAKE=true +TERMUX_PKG_HAS_DEBUG=false # Debug build succeeds but make install with: # cp: cannot stat '../src/projects/openmp/runtime/exports/common.min.50.ompt.optional/include/omp.h': No such file or directory # common.min.50.ompt.optional should be common.deb.50.ompt.optional when doing debug build diff --git a/packages/liblua/build.sh b/packages/liblua/build.sh index 0e5efcf974..e077c95470 100644 --- a/packages/liblua/build.sh +++ b/packages/liblua/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac TERMUX_PKG_SRCURL=https://www.lua.org/ftp/lua-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_MAKE_ARGS=linux -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BREAKS="liblua-dev" TERMUX_PKG_REPLACES="liblua-dev" TERMUX_PKG_BUILD_DEPENDS="readline" diff --git a/packages/liblua52/build.sh b/packages/liblua52/build.sh index 4f0d381690..467b1565b7 100644 --- a/packages/liblua52/build.sh +++ b/packages/liblua52/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f TERMUX_PKG_BREAKS="liblua52-dev" TERMUX_PKG_REPLACES="liblua52-dev" TERMUX_PKG_BUILD_DEPENDS="readline" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { sed \ diff --git a/packages/liblz4/build.sh b/packages/liblz4/build.sh index 549ea2ddee..85e1fbd622 100644 --- a/packages/liblz4/build.sh +++ b/packages/liblz4/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=f8377c89dad5c9f266edc0be9b73595296ecafd5bfa1000de148096c50052d TERMUX_PKG_BREAKS="liblz4-dev" TERMUX_PKG_REPLACES="liblz4-dev" TERMUX_PKG_SRCURL=https://github.com/lz4/lz4/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { TERMUX_PKG_SRCDIR+=lib diff --git a/packages/liblzma/build.sh b/packages/liblzma/build.sh index e70e259e1e..2280735565 100644 --- a/packages/liblzma/build.sh +++ b/packages/liblzma/build.sh @@ -7,4 +7,4 @@ TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/xz-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b TERMUX_PKG_BREAKS="liblzma-dev" TERMUX_PKG_REPLACES="liblzma-dev" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true diff --git a/packages/liblzma/xz-utils.subpackage.sh b/packages/liblzma/xz-utils.subpackage.sh index 69edcbd17b..d3a4502161 100644 --- a/packages/liblzma/xz-utils.subpackage.sh +++ b/packages/liblzma/xz-utils.subpackage.sh @@ -1,3 +1,3 @@ TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/" TERMUX_SUBPKG_DESCRIPTION="XZ-format compression tools" -TERMUX_SUBPKG_ESSENTIAL=yes +TERMUX_SUBPKG_ESSENTIAL=true diff --git a/packages/libmesode/build.sh b/packages/libmesode/build.sh index 93d5387205..5930fb5ffa 100644 --- a/packages/libmesode/build.sh +++ b/packages/libmesode/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=79bdf92e287d8891a8eb89d84a8b1bb1c3f61ded322630f583ec1d1c00d991 TERMUX_PKG_DEPENDS="openssl,libexpat" TERMUX_PKG_BREAKS="libmesode-dev" TERMUX_PKG_REPLACES="libmesode-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { ./bootstrap.sh diff --git a/packages/libmsgpack/build.sh b/packages/libmsgpack/build.sh index 5f909ed913..143f2ad9d7 100644 --- a/packages/libmsgpack/build.sh +++ b/packages/libmsgpack/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=fbaa28c363a316fd7523f31d1745cf03eab0d1e1ea5a1c60aa0dffd4ce551a TERMUX_PKG_BREAKS="libmsgpack-dev" TERMUX_PKG_REPLACES="libmsgpack-dev" TERMUX_PKG_SRCURL=https://github.com/msgpack/msgpack-c/releases/download/cpp-${TERMUX_PKG_VERSION}/msgpack-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DMSGPACK_BUILD_EXAMPLES=OFF -DMSGPACK_BUILD_TESTS=OFF diff --git a/packages/libotr/build.sh b/packages/libotr/build.sh index cdb8470e23..a2f173dddb 100644 --- a/packages/libotr/build.sh +++ b/packages/libotr/build.sh @@ -10,4 +10,4 @@ TERMUX_PKG_DEPENDS="libgcrypt" TERMUX_PKG_BREAKS="libotr-dev" TERMUX_PKG_REPLACES="libotr-dev" TERMUX_PKG_BUILD_DEPENDS="libgpg-error" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/libpcap/build.sh b/packages/libpcap/build.sh index 6559aa8531..f89a5f52ee 100644 --- a/packages/libpcap/build.sh +++ b/packages/libpcap/build.sh @@ -11,4 +11,4 @@ TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/libpcap-${TERMUX_PKG_VERSION}.t # ac_cv_lib_nl_3_nl_socket_alloc=no to avoid linking against libnl: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_nl_3_nl_socket_alloc=no --with-pcap=linux" TERMUX_PKG_RM_AFTER_INSTALL="bin/pcap-config share/man/man1/pcap-config.1" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh index 65b4c80eeb..e01aba04b8 100644 --- a/packages/libprotobuf/build.sh +++ b/packages/libprotobuf/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=98e615d592d237f94db8bf033fba78cd404d979b0b70351a9e5aaff7253983 TERMUX_PKG_DEPENDS="libc++, zlib" TERMUX_PKG_BREAKS="libprotobuf-dev" TERMUX_PKG_REPLACES="libprotobuf-dev" -TERMUX_PKG_FORCE_CMAKE=yes +TERMUX_PKG_FORCE_CMAKE=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON diff --git a/packages/librsync/build.sh b/packages/librsync/build.sh index a10838304c..ae565c319b 100644 --- a/packages/librsync/build.sh +++ b/packages/librsync/build.sh @@ -14,7 +14,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=$(which perl)" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/libsoxr/build.sh b/packages/libsoxr/build.sh index dbc7daaed8..d040e012bb 100644 --- a/packages/libsoxr/build.sh +++ b/packages/libsoxr/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://sourceforge.net/projects/soxr/files/soxr-$TERMUX_PKG_V TERMUX_PKG_SHA256=b111c15fdc8c029989330ff559184198c161100a59312f5dc19ddeb9b5a15889 TERMUX_PKG_BREAKS="libsoxr-dev" TERMUX_PKG_REPLACES="libsoxr-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { return 0 diff --git a/packages/libtalloc/build.sh b/packages/libtalloc/build.sh index 3dff4e4e82..c915652edd 100644 --- a/packages/libtalloc/build.sh +++ b/packages/libtalloc/build.sh @@ -7,12 +7,12 @@ TERMUX_PKG_SHA256=b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367 TERMUX_PKG_BREAKS="libtalloc-dev" TERMUX_PKG_REPLACES="libtalloc-dev" TERMUX_PKG_SRCURL=https://www.samba.org/ftp/talloc/talloc-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/libtermkey/build.sh b/packages/libtermkey/build.sh index cf9617ff77..b6fcb66897 100644 --- a/packages/libtermkey/build.sh +++ b/packages/libtermkey/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=http://www.leonerd.org.uk/code/libtermkey/libtermkey-${TERMUX_ TERMUX_PKG_DEPENDS="libunibilium" TERMUX_PKG_BREAKS="libtermkey-dev" TERMUX_PKG_REPLACES="libtermkey-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { return diff --git a/packages/libunibilium/build.sh b/packages/libunibilium/build.sh index 44edf31913..f9daca16d7 100644 --- a/packages/libunibilium/build.sh +++ b/packages/libunibilium/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1 TERMUX_PKG_BREAKS="libunibilium-dev" TERMUX_PKG_REPLACES="libunibilium-dev" TERMUX_PKG_SRCURL=https://github.com/mauke/unibilium/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { return diff --git a/packages/libunwind/build.sh b/packages/libunwind/build.sh index 026379fd50..ae12530058 100644 --- a/packages/libunwind/build.sh +++ b/packages/libunwind/build.sh @@ -16,7 +16,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh index 940bf1052c..ecf910f3ff 100644 --- a/packages/libvpx/build.sh +++ b/packages/libvpx/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_REPLACES="libvpx-dev" termux_step_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/libvterm/build.sh b/packages/libvterm/build.sh index 13bcdee7a4..8480da2ad9 100644 --- a/packages/libvterm/build.sh +++ b/packages/libvterm/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=1da101b5b5885acc83e9f84e2ac2d93d97ac85e09122af3d5dd2606d8fe93b TERMUX_PKG_BREAKS="libvterm-dev" TERMUX_PKG_REPLACES="libvterm-dev" TERMUX_PKG_SRCURL=https://github.com/neovim/libvterm/archive/$_COMMIT.zip -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { make src/encoding/DECdrawing.inc src/encoding/uk.inc diff --git a/packages/libzopfli/build.sh b/packages/libzopfli/build.sh index 6371b6ffd1..d386fd0287 100644 --- a/packages/libzopfli/build.sh +++ b/packages/libzopfli/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_BREAKS="libzopfli-dev" TERMUX_PKG_REPLACES="libzopfli-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_make_install() { make zopflipng diff --git a/packages/lldb/build.sh b/packages/lldb/build.sh index d64ee6b910..f5e954bf8b 100644 --- a/packages/lldb/build.sh +++ b/packages/lldb/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=49918b9f09816554a20ac44c5f85a32dc0a7a00759b3259e78064d674eac03 TERMUX_PKG_DEPENDS="libc++, libedit, libllvm, libxml2, ncurses-ui-libs" TERMUX_PKG_BREAKS="lldb-dev" TERMUX_PKG_REPLACES="lldb-dev" -TERMUX_PKG_HAS_DEBUG=no +TERMUX_PKG_HAS_DEBUG=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLLDB_DISABLE_CURSES=0 -DLLDB_DISABLE_LIBEDIT=0 diff --git a/packages/luarocks/build.sh b/packages/luarocks/build.sh index 129f15534a..2974655f55 100644 --- a/packages/luarocks/build.sh +++ b/packages/luarocks/build.sh @@ -7,8 +7,8 @@ TERMUX_PKG_SRCURL=https://luarocks.org/releases/luarocks-${TERMUX_PKG_VERSION}.t TERMUX_PKG_SHA256=c573435f495aac159e34eaa0a3847172a2298eb6295fcdc35d565f9f9b990513 TERMUX_PKG_DEPENDS="curl, lua" TERMUX_PKG_BUILD_DEPENDS="liblua" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_EXTRA_MAKE_ARGS="LUA=/usr/bin/lua5.3" termux_step_configure() { diff --git a/packages/make/build.sh b/packages/make/build.sh index 7c9a6fa79a..d96ec9fdac 100644 --- a/packages/make/build.sh +++ b/packages/make/build.sh @@ -20,7 +20,7 @@ termux_step_pre_configure() { termux_step_make() { # Allow to bootstrap make if building on device without make installed. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ] && [ -z "$(command -v make)" ]; then + if $TERMUX_ON_DEVICE_BUILD && [ -z "$(command -v make)" ]; then ./build.sh else make -j $TERMUX_MAKE_PROCESSES @@ -28,7 +28,7 @@ termux_step_make() { } termux_step_make_install() { - if [ -n "$TERMUX_ON_DEVICE_BUILD" ] && [ -z "$(command -v make)" ]; then + if $TERMUX_ON_DEVICE_BUILD && [ -z "$(command -v make)" ]; then ./make -j 1 install else make -j 1 install diff --git a/packages/man/build.sh b/packages/man/build.sh index a95aa00c3b..1193f88e6b 100644 --- a/packages/man/build.sh +++ b/packages/man/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7 TERMUX_PKG_SRCURL=http://mdocml.bsd.lv/snapshots/mandoc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="less,libandroid-glob,zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="share/examples" termux_step_pre_configure() { diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 04776382d4..f5cde7bb85 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -69,7 +69,7 @@ termux_step_host_build() { termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/mathomatic/build.sh b/packages/mathomatic/build.sh index 83fd7f4ae8..a93139c133 100644 --- a/packages/mathomatic/build.sh +++ b/packages/mathomatic/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=16.0.5 TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL="https://fossies.org/linux/misc/old/mathomatic-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=7f525bdb2e13006549dd8f17906c26f926f5ac51174f02f074107c612491e05c -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS="READLINE=1" TERMUX_PKG_DEPENDS="readline" TERMUX_PKG_RM_AFTER_INSTALL="share/applications/mathomatic.desktop share/pixmaps" diff --git a/packages/mc/build.sh b/packages/mc/build.sh index 46cb02ef49..1cd3922f30 100644 --- a/packages/mc/build.sh +++ b/packages/mc/build.sh @@ -18,7 +18,7 @@ ac_cv_path_ZIP=$TERMUX_PREFIX/bin/zip " termux_step_pre_configure() { - if [ "$TERMUX_DEBUG" == "true" ]; then + if $TERMUX_DEBUG; then # Debug build fails with: # /home/builder/.termux-build/mc/src/src/filemanager/file.c:2019:37: error: 'umask' called with invalid mode # src_mode = umask (-1); diff --git a/packages/mdp/build.sh b/packages/mdp/build.sh index 8fe96af96d..bf9815ae63 100644 --- a/packages/mdp/build.sh +++ b/packages/mdp/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_VERSION=1.0.15 TERMUX_PKG_SHA256=3edc8ea1551fdf290d6bba721105e2e2c23964070ac18c13b4b8d959cdf6116f TERMUX_PKG_SRCURL=https://github.com/visit1985/mdp/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/megatools/build.sh b/packages/megatools/build.sh index 2b6c6620ea..8cfbd82a76 100644 --- a/packages/megatools/build.sh +++ b/packages/megatools/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://megatools.megous.com/builds/megatools-${TERMUX_PKG_VER TERMUX_PKG_SHA256=179e84c68e24696c171238a72bcfe5e28198e4c4e9f9043704f36e5c0b17c38a TERMUX_PKG_DEPENDS="glib, libandroid-support, libcurl, libgmp, openssl" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-fuse --enable-docs-build" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { mkdir -p m4 diff --git a/packages/memcached/build.sh b/packages/memcached/build.sh index 3e13c706c2..77117545c4 100644 --- a/packages/memcached/build.sh +++ b/packages/memcached/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=45a22c890dc1edb27db567fb4c9c25b91bfd578477c08c5fb10dca93cc62cc TERMUX_PKG_DEPENDS="libevent, libsasl" TERMUX_PKG_BREAKS="memcached-dev" TERMUX_PKG_REPLACES="memcached-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-sasl --disable-coverage" termux_step_pre_configure() { diff --git a/packages/mg/build.sh b/packages/mg/build.sh index 9f3d9bfa41..ca74fb50a5 100644 --- a/packages/mg/build.sh +++ b/packages/mg/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/hboetes/mg/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=fbb09729ea00fe42dcdbc96ac7fc1d2b89eac651dec49e4e7af52fad4f5788f6 TERMUX_PKG_DEPENDS="libbsd, ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CFLAGS+=" $CPPFLAGS" diff --git a/packages/mime-support/build.sh b/packages/mime-support/build.sh index b15d89d147..31746db48b 100644 --- a/packages/mime-support/build.sh +++ b/packages/mime-support/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_VERSION=3.62 TERMUX_PKG_SHA256=54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/m/mime-support/mime-support_$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_CONFFILES="etc/mime.types" # etc/mime.types was previously in mutt: TERMUX_PKG_CONFLICTS="mutt (<< 1.8.3-1)" diff --git a/packages/mktorrent/build.sh b/packages/mktorrent/build.sh index b729b720a3..abcb3d307d 100644 --- a/packages/mktorrent/build.sh +++ b/packages/mktorrent/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_VERSION=1.1 TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/Rudde/mktorrent/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=d0f47500192605d01b5a2569c605e51ed319f557d24cfcbcb23a26d51d6138c9 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 4f00d2ed44..620c1b987f 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -22,7 +22,7 @@ TERMUX_PKG_CONFFILES="$TERMUX_PREFIX/etc/mpd.conf" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/multitail/build.sh b/packages/multitail/build.sh index 9ae6f54924..37b92b8f5a 100644 --- a/packages/multitail/build.sh +++ b/packages/multitail/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/multitail-${TERMUX_PKG_VERSION}.tgz TERMUX_PKG_SHA256=af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1fd TERMUX_PKG_DEPENDS="ncurses, ncurses-ui-libs, libandroid-glob" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CFLAGS+=" -DNCURSES_WIDECHAR" diff --git a/packages/nano/build.sh b/packages/nano/build.sh index 6685bb7adf..daee40d60f 100644 --- a/packages/nano/build.sh +++ b/packages/nano/build.sh @@ -17,7 +17,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/rnano share/man/man1/rnano.1 share/nano/man-htm termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" - if [ "$TERMUX_DEBUG" == "true" ]; then + if $TERMUX_DEBUG; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives this error: # /home/builder/.termux-build/_lib/16-aarch64-21-v3/bin/../sysroot/usr/include/bits/fortify/string.h:79:26: error: use of undeclared identifier '__USE_FORTIFY_LEVEL' export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} diff --git a/packages/ncdc/build.sh b/packages/ncdc/build.sh index 9470057d82..e2b48a1dbe 100644 --- a/packages/ncdc/build.sh +++ b/packages/ncdc/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://dev.yorhel.nl/download/ncdc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d15fd378aa345f423e59a38691c668f69b516cd4b8afbbcdc446007740c3afad TERMUX_PKG_DEPENDS="libandroid-support, libiconv, libgnutls, libsqlite, bzip2, glib, ncurses, zlib" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_configure() { # Cross compiling steps documented in ncdc README diff --git a/packages/ncmpcpp/build.sh b/packages/ncmpcpp/build.sh index e5a5fa20d9..ac81cd33bb 100644 --- a/packages/ncmpcpp/build.sh +++ b/packages/ncmpcpp/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=11 TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554 TERMUX_PKG_DEPENDS="fftw, boost, readline, libandroid-support, libc++, libcurl, libmpdclient, ncurses, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-visualizer --enable-outputs --enable-clock" termux_step_pre_configure() { diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh index a07bcc130b..dc6e31fc49 100644 --- a/packages/ndk-multilib/build.sh +++ b/packages/ndk-multilib/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION TERMUX_PKG_REVISION=1 TERMUX_PKG_PLATFORM_INDEPENDENT=true -TERMUX_PKG_NO_STATICSPLIT=yes +TERMUX_PKG_NO_STATICSPLIT=true prepare_libs() { local ARCH="$1" diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index 1de99599f5..d84422841c 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1 # and iconv.h from libandroid-support-dev: TERMUX_PKG_CONFLICTS="libutil-dev, libgcc, libandroid-support-dev" TERMUX_PKG_REPLACES="libutil-dev, libgcc, libandroid-support-dev, ndk-stl" -TERMUX_PKG_NO_STATICSPLIT=yes +TERMUX_PKG_NO_STATICSPLIT=true termux_step_extract_into_massagedir() { mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib \ diff --git a/packages/ne/build.sh b/packages/ne/build.sh index a1bc3786ff..3ee79e6bbb 100644 --- a/packages/ne/build.sh +++ b/packages/ne/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/ne-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=31710ce07d6134355f311b249dcd0a8c99c0075b377bbb78a99ee1338d00c6a3 TERMUX_PKG_DEPENDS="libandroid-support, ncurses" TERMUX_PKG_RM_AFTER_INSTALL="info/" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { export OPTS="$CFLAGS $CPPFLAGS" diff --git a/packages/neofetch/build.sh b/packages/neofetch/build.sh index 69e0379e52..d0ecd0187b 100644 --- a/packages/neofetch/build.sh +++ b/packages/neofetch/build.sh @@ -7,5 +7,5 @@ TERMUX_PKG_SHA256=264a7689561bb498f97f10231959bdd8f7c873671bac2ffb660de9a5863b1c TERMUX_PKG_SRCURL=https://github.com/dylanaraps/neofetch/archive/${TERMUX_PKG_VERSION}/neofetch-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="bash" TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX SYSCONFDIR=$TERMUX_PREFIX/etc" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh index 42e8964e11..209b80f4e1 100644 --- a/packages/netpbm/build.sh +++ b/packages/netpbm/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERM TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff, zlib" TERMUX_PKG_BREAKS="netpbm-dev" TERMUX_PKG_REPLACES="netpbm-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { # Put the android libpng-config script in the path (before the host one): diff --git a/packages/newsboat/build.sh b/packages/newsboat/build.sh index 478182cc94..0679157cb8 100644 --- a/packages/newsboat/build.sh +++ b/packages/newsboat/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.16.1 TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=4023c817b36fc08a3191283eec2c7161949c0727633f60ad837e11c599d3ad53 TERMUX_PKG_DEPENDS="libc++, libiconv, libandroid-support, libandroid-glob, json-c, libsqlite, libcurl, libxml2, stfl, ncurses, openssl" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="share/locale" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_bsd_main=no" TERMUX_PKG_CONFLICTS=newsbeuter diff --git a/packages/nginx/build.sh b/packages/nginx/build.sh index 74b093ed17..1e8d87b821 100644 --- a/packages/nginx/build.sh +++ b/packages/nginx/build.sh @@ -13,7 +13,7 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi @@ -26,7 +26,7 @@ termux_step_pre_configure() { termux_step_configure() { DEBUG_FLAG="" - test -n "$TERMUX_DEBUG" && DEBUG_FLAG="--with-debug" + $TERMUX_DEBUG && DEBUG_FLAG="--with-debug" ./configure \ --prefix=$TERMUX_PREFIX \ diff --git a/packages/nim/build.sh b/packages/nim/build.sh index f11b845191..663dbb6f17 100644 --- a/packages/nim/build.sh +++ b/packages/nim/build.sh @@ -6,8 +6,8 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://nim-lang.org/download/nim-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=e1fa5c7e762a45535d82a961f88a6fc82e343985b780c3674081810e028d2b5e TERMUX_PKG_DEPENDS="clang, git, libandroid-glob" -TERMUX_PKG_HOSTBUILD=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_HOSTBUILD=true +TERMUX_PKG_BUILD_IN_SRC=true termux_step_host_build() { cp -r ../src/* ./ diff --git a/packages/ninja/build.sh b/packages/ninja/build.sh index adb0197a65..d4db738955 100644 --- a/packages/ninja/build.sh +++ b/packages/ninja/build.sh @@ -12,7 +12,7 @@ termux_step_configure() { } termux_step_make() { - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then $TERMUX_PKG_SRCDIR/configure.py --bootstrap else termux_setup_ninja diff --git a/packages/nmap/build.sh b/packages/nmap/build.sh index fe41d855c7..4c333673f6 100644 --- a/packages/nmap/build.sh +++ b/packages/nmap/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_DEPENDS="libc++, libpcap, pcre, openssl, resolv-conf, netcat, liblua, # --without-zenmap to avoid python scripts for graphical gtk frontend: # --without-ndiff to avoid python2-using ndiff utility: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static --with-liblua=$TERMUX_PREFIX --without-nmap-update --without-zenmap --without-ndiff" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_make_install() { # Setup 'netcat' and 'nc' as symlink to 'ncat', since the other netcat implementations diff --git a/packages/nnn/build.sh b/packages/nnn/build.sh index 296bc0da7e..900d395de3 100644 --- a/packages/nnn/build.sh +++ b/packages/nnn/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_VERSION=2.6 TERMUX_PKG_SHA256=17fd3e517308e41065594ffe8dcde348b4d10dea4240699f4708337db48b3e25 TERMUX_PKG_SRCURL=https://github.com/jarun/nnn/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="file, findutils, readline, wget, libandroid-support" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index a9c3a718e3..ca0523b067 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_SHA256=18e37f891d10ea7fbc8f6410c444c2b1d9cc3cbbb1d35aa9c41f7618169566 # symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462. TERMUX_PKG_DEPENDS="libc++, openssl, c-ares, libicu, zlib" TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_CONFLICTS="nodejs" TERMUX_PKG_BREAKS="nodejs-lts-dev" TERMUX_PKG_REPLACES="nodejs-lts-dev" diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index b8fd51a661..fc0e976db1 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_SHA256=20b52366d3502c60d4aec0bd5052c841a94bf1cd5d74b2ea1e498c1a2ada8c # symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462. TERMUX_PKG_DEPENDS="libc++, openssl, c-ares, libicu, zlib" TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_CONFLICTS="nodejs-lts, nodejs-current" TERMUX_PKG_BREAKS="nodejs-dev" TERMUX_PKG_REPLACES="nodejs-current, nodejs-dev" diff --git a/packages/notmuch/build.sh b/packages/notmuch/build.sh index 260513b817..2d77ee4cfa 100644 --- a/packages/notmuch/build.sh +++ b/packages/notmuch/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION} TERMUX_PKG_DEPENDS="glib, libc++, libgmime, libtalloc, libxapian, zlib" TERMUX_PKG_BREAKS="notmuch-dev" TERMUX_PKG_REPLACES="notmuch-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { # Use python3 so that the python3-sphinx package is diff --git a/packages/nyancat/build.sh b/packages/nyancat/build.sh index ecb7133cd2..617ebdb5b6 100644 --- a/packages/nyancat/build.sh +++ b/packages/nyancat/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_VERSION=1.5.2 TERMUX_PKG_SHA256=88cdcaa9c7134503dd0364a97fa860da3381a09cb555c3aae9918360827c2032 TERMUX_PKG_SRCURL=https://github.com/klange/nyancat/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/nzbget/build.sh b/packages/nzbget/build.sh index b3ec5fe665..cd97aefb20 100644 --- a/packages/nzbget/build.sh +++ b/packages/nzbget/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/nzbget/nzbget/releases/download/v${TERMUX_P TERMUX_PKG_SHA256=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53 TERMUX_PKG_DEPENDS="libc++, libxml2, ncurses, openssl, p7zip, zlib" TERMUX_PKG_RECOMMENDS="unrar" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_create_debscripts() { echo "#!$TERMUX_PREFIX/bin/sh" > postinst diff --git a/packages/oathtool/build.sh b/packages/oathtool/build.sh index 6e521637ad..d111167b2d 100644 --- a/packages/oathtool/build.sh +++ b/packages/oathtool/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_REPLACES="oathtool-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pam" termux_step_pre_configure() { - if [ "$TERMUX_DEBUG" == "true" ]; then + if $TERMUX_DEBUG; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives this error: # /home/builder/.termux-build/oathtool/src/liboath/usersfile.c:482:46: error: 'umask' called with invalid mode # old_umask = umask (~(S_IRUSR | S_IWUSR)); diff --git a/packages/odt2txt/build.sh b/packages/odt2txt/build.sh index 902407e894..bc432a924f 100644 --- a/packages/odt2txt/build.sh +++ b/packages/odt2txt/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/dstosberg/odt2txt/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=23a889109ca9087a719c638758f14cc3b867a5dcf30a6c90bf6a0985073556dd TERMUX_PKG_DEPENDS="libiconv, libzip, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS="DESTDIR=$TERMUX_PREFIX" termux_step_configure() { diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh index 214fd6963b..49356d4d73 100644 --- a/packages/openjpeg/build.sh +++ b/packages/openjpeg/build.sh @@ -13,7 +13,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_STATIC_LIBS=OFF" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index a3c0b42703..0cdc421327 100644 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -46,7 +46,7 @@ TERMUX_PKG_CONFFILES="etc/ssh/ssh_config etc/ssh/sshd_config" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index 3226f98ef7..f66f4fec1a 100644 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz TERMUX_PKG_CONFFILES="etc/tls/openssl.cnf" TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_CONFLICTS="libcurl (<< 7.61.0-1)" TERMUX_PKG_BREAKS="openssl-tool (<< 1.1.1b-1), openssl-dev" TERMUX_PKG_REPLACES="openssl-tool (<< 1.1.1b-1), openssl-dev" @@ -16,7 +16,7 @@ TERMUX_PKG_REPLACES="openssl-tool (<< 1.1.1b-1), openssl-dev" termux_step_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/optipng/build.sh b/packages/optipng/build.sh index 4658614a91..0d0c0849f0 100644 --- a/packages/optipng/build.sh +++ b/packages/optipng/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf8582166544 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/optipng/OptiPNG/optipng-${TERMUX_PKG_VERSION}/optipng-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libpng, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-zlib --with-system-libpng --mandir=$TERMUX_PREFIX/share/man" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { LD=$CC diff --git a/packages/opusfile/build.sh b/packages/opusfile/build.sh index 266e099270..acab42dadb 100644 --- a/packages/opusfile/build.sh +++ b/packages/opusfile/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.11 TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf TERMUX_PKG_SRCURL=https://downloads.xiph.org/releases/opus/opusfile-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libopus, libogg" TERMUX_PKG_BREAKS="opusfile-dev" TERMUX_PKG_REPLACES="opusfile-dev" diff --git a/packages/ossp-uuid/build.sh b/packages/ossp-uuid/build.sh index bd2f9730f3..c371b7bcb7 100644 --- a/packages/ossp-uuid/build.sh +++ b/packages/ossp-uuid/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=http://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/u TERMUX_PKG_SHA256=11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0 TERMUX_PKG_BREAKS="ossp-uuid-dev" TERMUX_PKG_REPLACES="ossp-uuid-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--includedir=$TERMUX_PREFIX/include/ossp-uuid" termux_step_pre_configure() { diff --git a/packages/p7zip/build.sh b/packages/p7zip/build.sh index 8a2cdaff9e..76f0660c28 100644 --- a/packages/p7zip/build.sh +++ b/packages/p7zip/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/p7zip/p7zip/${TERMUX_PKG_VERSION}/p7zip_${TERMUX_PKG_VERSION}_src_all.tar.bz2 TERMUX_PKG_SHA256=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f TERMUX_PKG_DEPENDS="libc++" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { export CXXFLAGS="$CXXFLAGS -Wno-c++11-narrowing" diff --git a/packages/par2/build.sh b/packages/par2/build.sh index 81eee0ced1..cc53a6d8b6 100644 --- a/packages/par2/build.sh +++ b/packages/par2/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=0.8.0 TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/Parchive/par2cmdline/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=461b45627a0d800061657b2d800c432c7d1c86c859b40a3ced35a0cc6a85faca -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { if [ $TERMUX_ARCH = "i686" ]; then diff --git a/packages/parallel/build.sh b/packages/parallel/build.sh index 8b6446ccaa..85f529530d 100644 --- a/packages/parallel/build.sh +++ b/packages/parallel/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_VERSION=20190722 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/parallel/parallel-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=0ed0863184dbb396b4c030848e754b1ea76329c06ae9e43314bc0915eb6cbca7 TERMUX_PKG_DEPENDS="perl" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/pass-otp/build.sh b/packages/pass-otp/build.sh index 4844fbce59..a219771a6e 100644 --- a/packages/pass-otp/build.sh +++ b/packages/pass-otp/build.sh @@ -5,8 +5,8 @@ TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=1.2.0 TERMUX_PKG_SHA256=5720a649267a240a4f7ba5a6445193481070049c1d08ba38b00d20fc551c3a67 TERMUX_PKG_SRCURL=https://github.com/tadfisher/pass-otp/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_DEPENDS="pass, oathtool" TERMUX_PKG_SUGGESTS="libqrencode" diff --git a/packages/pass/build.sh b/packages/pass/build.sh index 5875bf8ed5..3febeb093f 100644 --- a/packages/pass/build.sh +++ b/packages/pass/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_VERSION=1.7.3 TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=2b6c65846ebace9a15a118503dcd31b6440949a30d3b5291dfb5b1615b99a3f4 TERMUX_PKG_SRCURL=https://git.zx2c4.com/password-store/snapshot/password-store-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true # Depend on coreutils as pass uses [:graph:] when calling tr, which busybox tr does not support: TERMUX_PKG_DEPENDS="bash, gnupg (>= 2.2.9-1), tree, coreutils" TERMUX_PKG_RECOMMENDS="git" TERMUX_PKG_SUGGESTS="pass-otp" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/pastebinit/build.sh b/packages/pastebinit/build.sh index 2b261a9bea..a51f17c2bc 100644 --- a/packages/pastebinit/build.sh +++ b/packages/pastebinit/build.sh @@ -6,13 +6,13 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://launchpad.net/pastebinit/trunk/${TERMUX_PKG_VERSION}/+download/pastebinit-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=42e5a84ce7e46825fb3b6478e11893fad357197327257e474bd0d3549f438457 TERMUX_PKG_DEPENDS="python" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/patchelf/build.sh b/packages/patchelf/build.sh index e4de49ef29..65a44fe583 100644 --- a/packages/patchelf/build.sh +++ b/packages/patchelf/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/NixOS/patchelf/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=b3cb6bdedcef5607ce34a350cf0b182eb979f8f7bc31eae55a93a70a3f020d13 TERMUX_PKG_DEPENDS="libc++" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { ./bootstrap.sh diff --git a/packages/pathpicker/build.sh b/packages/pathpicker/build.sh index 10b82cd013..efd309376b 100644 --- a/packages/pathpicker/build.sh +++ b/packages/pathpicker/build.sh @@ -5,8 +5,8 @@ TERMUX_PKG_VERSION=0.8.2 TERMUX_PKG_SRCURL=https://github.com/facebook/PathPicker/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=7d1beb76f9864c1f13a25fe382e3467684999068bfcbb99053eb4bc322d6a80c TERMUX_PKG_DEPENDS="bash,python" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { _PKG_DIR=$TERMUX_PREFIX/share/pathpicker diff --git a/packages/perl/build.sh b/packages/perl/build.sh index 7902130b8f..20a5582546 100644 --- a/packages/perl/build.sh +++ b/packages/perl/build.sh @@ -8,14 +8,14 @@ TERMUX_PKG_SHA256=(851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf97 49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703) TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz https://github.com/arsv/perl-cross/releases/download/${TERMUX_PKG_VERSION[1]}/perl-cross-${TERMUX_PKG_VERSION[1]}.tar.gz) -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_MAKE_PROCESSES=1 TERMUX_PKG_RM_AFTER_INSTALL="bin/perl${TERMUX_PKG_VERSION}" termux_step_post_extract_package() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/pforth/build.sh b/packages/pforth/build.sh index 3d1179dc8a..62dfe6ea82 100644 --- a/packages/pforth/build.sh +++ b/packages/pforth/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=20180513 TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=3cf472bb944aa53b0eb0b93d021c8c2c0eff18dd2e3e54daddaf4af342e441ea TERMUX_PKG_SRCURL=https://github.com/philburk/pforth/archive/${_COMMIT}.zip -TERMUX_PKG_HOSTBUILD=yes +TERMUX_PKG_HOSTBUILD=true termux_step_post_configure() { # Avoid caching the host build as it differs between arches diff --git a/packages/pick/build.sh b/packages/pick/build.sh index 7b3f7929b0..04d39e1c6a 100644 --- a/packages/pick/build.sh +++ b/packages/pick/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=3.0.1 TERMUX_PKG_SHA256=668c863751f94ad90e295cf861a80b4d94975e06645f401d7f82525e607c0266 TERMUX_PKG_SRCURL=https://github.com/calleerlandsson/pick/releases/download/v${TERMUX_PKG_VERSION}/pick-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { export MANDIR=$TERMUX_PREFIX/share/man diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh index 3a5be2a917..db708c9041 100644 --- a/packages/picolisp/build.sh +++ b/packages/picolisp/build.sh @@ -14,7 +14,7 @@ TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686, x86_64" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/pkg-config/build.sh b/packages/pkg-config/build.sh index b3f11635da..844c94bf80 100644 --- a/packages/pkg-config/build.sh +++ b/packages/pkg-config/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/*-pkg-config" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/play-audio/build.sh b/packages/play-audio/build.sh index 7df0ce5689..838ed7d966 100644 --- a/packages/play-audio/build.sh +++ b/packages/play-audio/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/termux/play-audio/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e114123c4b337cddb1d4aa6c3287574d8c81b2dc4b3abc07ce21616fa14f9e82 TERMUX_PKG_DEPENDS="libc++" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/postgresql/build.sh b/packages/postgresql/build.sh index e2e507c464..58697e1aaf 100644 --- a/packages/postgresql/build.sh +++ b/packages/postgresql/build.sh @@ -25,7 +25,7 @@ ZIC=$TERMUX_PKG_HOSTBUILD_DIR/src/timezone/zic " TERMUX_PKG_EXTRA_MAKE_ARGS=" -s" TERMUX_PKG_RM_AFTER_INSTALL="lib/libecpg* bin/ecpg share/man/man1/ecpg.1" -TERMUX_PKG_HOSTBUILD=yes +TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_BREAKS="postgresql-contrib (<= 10.3-1), postgresql-dev" TERMUX_PKG_REPLACES="postgresql-contrib (<= 10.3-1), postgresql-dev" @@ -39,7 +39,7 @@ termux_step_host_build() { termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/privoxy/build.sh b/packages/privoxy/build.sh index 6bfb9d8cac..16f2d70918 100644 --- a/packages/privoxy/build.sh +++ b/packages/privoxy/build.sh @@ -11,12 +11,12 @@ ac_cv_lib_pcreposix_regcomp=no --sysconfdir=$TERMUX_PREFIX/etc/privoxy " TERMUX_PKG_DEPENDS="pcre, libpcreposix, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/procps/build.sh b/packages/procps/build.sh index e0b79c8fb7..41e6b2f867 100644 --- a/packages/procps/build.sh +++ b/packages/procps/build.sh @@ -8,8 +8,8 @@ TERMUX_PKG_SHA256=10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f04 TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_BREAKS="procps-dev" TERMUX_PKG_REPLACES="procps-dev" -TERMUX_PKG_ESSENTIAL=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_ESSENTIAL=true +TERMUX_PKG_BUILD_IN_SRC=true # error.h and stdio_ext.h in unified headers does # not provide any functionality prior to android-23: diff --git a/packages/profanity/build.sh b/packages/profanity/build.sh index be7faf2f94..6fcce59c0e 100644 --- a/packages/profanity/build.sh +++ b/packages/profanity/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_REPLACES="profanity-dev" # openssl, libexpat needed by libmesode, pcre needed by glib: TERMUX_PKG_BUILD_DEPENDS="openssl, libexpat, pcre, libgcrypt, libcrypt" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-python-plugins" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.7m" diff --git a/packages/proxychains-ng/build.sh b/packages/proxychains-ng/build.sh index 169feae15a..0662c4d652 100644 --- a/packages/proxychains-ng/build.sh +++ b/packages/proxychains-ng/build.sh @@ -5,12 +5,12 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=4.14 TERMUX_PKG_SRCURL=https://github.com/rofl0r/proxychains-ng/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=ab31626af7177cc2669433bb244b99a8f98c08031498233bb3df3bcc9711a9cc -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/psmisc/build.sh b/packages/psmisc/build.sh index c91e96e184..eb17cdd853 100644 --- a/packages/psmisc/build.sh +++ b/packages/psmisc/build.sh @@ -6,6 +6,6 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/psmisc-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=4b7cbffdc9373474da49b85dc3457ae511c43dc7fa7d94513fe06f89dcb87880 TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_ESSENTIAL=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_ESSENTIAL=true +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="bin/pstree.x11" diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh index 7678b259ea..1c7ac9cea3 100644 --- a/packages/radare2/build.sh +++ b/packages/radare2/build.sh @@ -8,13 +8,13 @@ TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION. TERMUX_PKG_DEPENDS="libuv" TERMUX_PKG_BREAKS="radare2-dev" TERMUX_PKG_REPLACES="radare2-dev" -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/ranger/build.sh b/packages/ranger/build.sh index 2380518ee5..913972bfae 100644 --- a/packages/ranger/build.sh +++ b/packages/ranger/build.sh @@ -6,8 +6,8 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=49a2d8dc5fa7b1c0cac0fa72d4ad704fc7107dee36cb9feb325a42754774d363 TERMUX_PKG_SRCURL=https://github.com/ranger/ranger/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="python, file" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make() { echo Skipping make step... diff --git a/packages/rcs/build.sh b/packages/rcs/build.sh index 784c82a32e..43fab66378 100644 --- a/packages/rcs/build.sh +++ b/packages/rcs/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=5.9.4 TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://gnu.uberglobalmirror.com/rcs/rcs-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_SHA256=063d5a0d7da1821754b80c639cdae2c82b535c8ff4131f75dc7bbf0cd63a5dff TERMUX_PKG_DEPENDS="diffutils" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_path_DIFF=$TERMUX_PREFIX/bin/diff \ diff --git a/packages/redir/build.sh b/packages/redir/build.sh index 4502808bd9..daa01bba15 100644 --- a/packages/redir/build.sh +++ b/packages/redir/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.3 TERMUX_PKG_SHA256=7ce53ac52a24c1b3279b994bfffbd429c44df2db10a4b1a0f54e108604fdae6e TERMUX_PKG_SRCURL=https://github.com/troglobit/redir/releases/download/v$TERMUX_PKG_VERSION/redir-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps" termux_step_pre_configure() { diff --git a/packages/redis/build.sh b/packages/redis/build.sh index 58a1ac1f0f..ce66934849 100644 --- a/packages/redis/build.sh +++ b/packages/redis/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=5.0.5 TERMUX_PKG_SRCURL=http://download.redis.io/releases/redis-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=2139009799d21d8ff94fc40b7f36ac46699b9e1254086299f8d3b223ca54a375 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_CONFFILES="etc/redis.conf" termux_step_pre_configure() { diff --git a/packages/remind/build.sh b/packages/remind/build.sh index 3097baac10..5760257855 100644 --- a/packages/remind/build.sh +++ b/packages/remind/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=3.1.16 TERMUX_PKG_SHA256=eeb79bd4019d23a033fe3e86c672d960399db6a27c747e5b466ad55831dfca93 TERMUX_PKG_SRCURL=https://dianne.skoll.ca/projects/remind/download/remind-0${TERMUX_PKG_VERSION:0:1}.0${TERMUX_PKG_VERSION:2:1}.${TERMUX_PKG_VERSION:4:2}.tar.gz TERMUX_PKG_DEPENDS="libandroid-glob" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="bin/tkremind share/man/man1/tkremind.1 bin/cm2rem.tcl share/man/man1/cm2rem.1" termux_step_pre_configure() { diff --git a/packages/ripgrep/build.sh b/packages/ripgrep/build.sh index 82a5b0c080..92262c5197 100644 --- a/packages/ripgrep/build.sh +++ b/packages/ripgrep/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=11.0.2 TERMUX_PKG_SHA256=0983861279936ada8bc7a6d5d663d590ad34eb44a44c75c2d6ccd0ab33490055 TERMUX_PKG_SRCURL=https://github.com/BurntSushi/ripgrep/archive/$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_make_install() { # Install man page: diff --git a/packages/root-repo/build.sh b/packages/root-repo/build.sh index 174b0a32a1..9f90fefe48 100644 --- a/packages/root-repo/build.sh +++ b/packages/root-repo/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=1.5 TERMUX_PKG_DEPENDS="termux-keyring" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d diff --git a/packages/rtmpdump/build.sh b/packages/rtmpdump/build.sh index 5f001c62cd..0d98941453 100644 --- a/packages/rtmpdump/build.sh +++ b/packages/rtmpdump/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_VERSION=2.4 TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://gitlab.com/JudgeZarbi/RTMPDump-OpenSSL-1.1/-/archive/019592918b0f961104eaf71b56c1db0fa26ed497/RTMPDump-OpenSSL-1.1-019592918b0f961104eaf71b56c1db0fa26ed497.tar.bz2 TERMUX_PKG_SHA256=42978d5b1cfe9fe4e01305f81c183935056a6c1ad46b9cd2e582f9147196fa87 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="openssl, zlib" TERMUX_PKG_BREAKS="rtmpdump-dev" TERMUX_PKG_REPLACES="rtmpdump-dev" diff --git a/packages/sc-im/build.sh b/packages/sc-im/build.sh index 8049b77e23..c1a93a1911 100644 --- a/packages/sc-im/build.sh +++ b/packages/sc-im/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/andmarti1424/sc-im/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=87225918cb6f52bbc068ee6b12eaf176c7c55ba9739b29ca08cb9b6699141cad TERMUX_PKG_DEPENDS="libandroid-support, libzip, ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_configure() { CFLAGS+=" $CPPFLAGS -I$TERMUX_PREFIX/include/libandroid-support" diff --git a/packages/sc/build.sh b/packages/sc/build.sh index 766e4c1aeb..a85ded5c97 100644 --- a/packages/sc/build.sh +++ b/packages/sc/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/sc-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=1997a00b6d82d189b65f6fd2a856a34992abc99e50d9ec463bbf1afb750d1765 TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS="SIMPLE=-DSIMPLE" termux_step_post_configure () { diff --git a/packages/science-repo/build.sh b/packages/science-repo/build.sh index 1be2c39a9d..53cdbc3889 100644 --- a/packages/science-repo/build.sh +++ b/packages/science-repo/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=1.0 TERMUX_PKG_DEPENDS="termux-keyring" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d diff --git a/packages/screenfetch/build.sh b/packages/screenfetch/build.sh index ef0724b92f..a87011c5f5 100644 --- a/packages/screenfetch/build.sh +++ b/packages/screenfetch/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_DEPENDS="bash" TERMUX_PKG_VERSION=3.8.0 TERMUX_PKG_SRCURL=https://github.com/KittyKatt/screenFetch/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=248283ee3c24b0dbffb79ed685bdd518554073090c1c167d07ad2a729db26633 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { install screenfetch-dev ${TERMUX_PREFIX}/bin/screenfetch diff --git a/packages/seafile-client/build.sh b/packages/seafile-client/build.sh index 53990c1f5e..f327e9c21b 100644 --- a/packages/seafile-client/build.sh +++ b/packages/seafile-client/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=c79a186e3a512454cb65d863bd45ecc8ae2c66a0dd2010533f3fed7862fa92 TERMUX_PKG_DEPENDS="ccnet, libcurl" TERMUX_PKG_BREAKS="seafile-client-dev" TERMUX_PKG_REPLACES="seafile-client-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { ./autogen.sh diff --git a/packages/sed/build.sh b/packages/sed/build.sh index c4c9970506..fceef877dd 100644 --- a/packages/sed/build.sh +++ b/packages/sed/build.sh @@ -5,8 +5,8 @@ TERMUX_PKG_VERSION=4.7 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/sed/sed-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a -TERMUX_PKG_ESSENTIAL=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_ESSENTIAL=true +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CFLAGS+=" -D__USE_FORTIFY_LEVEL=2" diff --git a/packages/sensible-utils/build.sh b/packages/sensible-utils/build.sh index c3b07f7ef1..fa7f5a978a 100644 --- a/packages/sensible-utils/build.sh +++ b/packages/sensible-utils/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_VERSION=0.0.12 TERMUX_PKG_SHA256=99ba2ebf8c57447c69d426b99b84ff9dc817be0bc4988ec6890a14558c529e2e TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_prog_PO4A=/bin/echo" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/serf/build.sh b/packages/serf/build.sh index 883be5fd93..7e79e53f0f 100644 --- a/packages/serf/build.sh +++ b/packages/serf/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87 TERMUX_PKG_DEPENDS="apr, apr-util, openssl, libuuid, libexpat, zlib" TERMUX_PKG_BREAKS="serf-dev" TERMUX_PKG_REPLACES="serf-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { scons APR=$TERMUX_PREFIX \ diff --git a/packages/shellharden/build.sh b/packages/shellharden/build.sh index 09c5f79ff4..a16050fa18 100644 --- a/packages/shellharden/build.sh +++ b/packages/shellharden/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=4.1 TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/anordal/shellharden/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=2714b827f72c336b7abf87f5a291ec182443a5479ec3eee516d6e04c81d56414 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_make_install() { install -Dm700 \ diff --git a/packages/sl/build.sh b/packages/sl/build.sh index ca888896b1..65bd360ab3 100644 --- a/packages/sl/build.sh +++ b/packages/sl/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/mtoyoda/sl/archive/${TERMUX_PKG_VERSION}.ta TERMUX_PKG_SHA256=1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_LICENSE_FILE="LICENSE" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { install sl $TERMUX_PREFIX/bin/ diff --git a/packages/socat/build.sh b/packages/socat/build.sh index cc2f852169..1fd3613cbf 100644 --- a/packages/socat/build.sh +++ b/packages/socat/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=1.7.3.3 TERMUX_PKG_SHA256=8cc0eaee73e646001c64adaab3e496ed20d4d729aaaf939df2a761e99c674372 TERMUX_PKG_SRCURL=http://www.dest-unreach.org/socat/download/socat-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_header_resolv_h=no ac_cv_c_compiler_gnu=yes ac_compiler_gnu=yes" # sc_cv_sys_crdly_shift=9 sc_cv_sys_csize_shift=4 sc_cv_sys_tabdly_shift=11" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { LDFLAGS="$LDFLAGS -llog" # uses syslog diff --git a/packages/stag/build.sh b/packages/stag/build.sh index 30e230f3f0..18e541336d 100644 --- a/packages/stag/build.sh +++ b/packages/stag/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.0.0 TERMUX_PKG_SRCURL=https://github.com/seenaburns/stag/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=391574e6aa12856d5a598a374e3a40a38cbab6ef9d769c0d59af8411b4fbecb6 TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CFLAGS+=" $CPPFLAGS" diff --git a/packages/stfl/build.sh b/packages/stfl/build.sh index bfafd8f906..ba49fe8771 100644 --- a/packages/stfl/build.sh +++ b/packages/stfl/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c0 TERMUX_PKG_DEPENDS="libandroid-support, libiconv, ncurses" TERMUX_PKG_BREAKS="stfl-dev" TERMUX_PKG_REPLACES="stfl-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { CC+=" $CPPFLAGS" diff --git a/packages/stow/build.sh b/packages/stow/build.sh index 8872b6d7a0..64f19a43fd 100644 --- a/packages/stow/build.sh +++ b/packages/stow/build.sh @@ -5,5 +5,5 @@ TERMUX_PKG_VERSION=2.3.1 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/stow-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=09d5d99671b78537fd9b2c0b39a5e9761a7a0e979f6fdb7eabfa58ee45f03d4b TERMUX_PKG_DEPENDS="perl" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/swig/build.sh b/packages/swig/build.sh index 84bc450c12..33fc27c20c 100644 --- a/packages/swig/build.sh +++ b/packages/swig/build.sh @@ -7,4 +7,4 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/swig/swig-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=e8a39cd6437e342cdcbd5af27a9bf11b62dc9efec9248065debcb8276fcbb925 TERMUX_PKG_DEPENDS="libc++, pcre, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/tar/build.sh b/packages/tar/build.sh index 3a3b31bd72..feca4cdad6 100644 --- a/packages/tar/build.sh +++ b/packages/tar/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 TERMUX_PKG_DEPENDS="libandroid-glob, libiconv" -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_ESSENTIAL=true # When cross-compiling configure guesses that d_ino in struct dirent only exists # if triplet matches linux*-gnu*, so we force set it explicitly: diff --git a/packages/termux-am/build.sh b/packages/termux-am/build.sh index 99e39e561f..8aeb60403c 100644 --- a/packages/termux-am/build.sh +++ b/packages/termux-am/build.sh @@ -5,8 +5,8 @@ TERMUX_PKG_MAINTAINER="Michal Bednarski @michalbednarski" TERMUX_PKG_VERSION=0.3 TERMUX_PKG_SHA256=3abfaca319f59fa769480c33d50e2ee1ff73122eac7c658f9e2a66a2da29ebb7 TERMUX_PKG_SRCURL=https://github.com/termux/TermuxAm/archive/v$TERMUX_PKG_VERSION.zip -TERMUX_PKG_PLATFORM_INDEPENDENT=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_CONFLICTS="termux-tools (<< 0.51)" termux_step_make() { diff --git a/packages/termux-api/build.sh b/packages/termux-api/build.sh index 1485990b20..df8b32024f 100644 --- a/packages/termux-api/build.sh +++ b/packages/termux-api/build.sh @@ -4,5 +4,5 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=0.46 TERMUX_PKG_SHA256=5c4198b5a3171c1ae1dae629b102085c056d88f32b0c791eeec4d191937d96b0 TERMUX_PKG_SRCURL=https://github.com/termux/termux-api-package/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="bash" diff --git a/packages/termux-apt-repo/build.sh b/packages/termux-apt-repo/build.sh index 8ba0973e22..786d1b36a0 100644 --- a/packages/termux-apt-repo/build.sh +++ b/packages/termux-apt-repo/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=0.4 TERMUX_PKG_SHA256=54ea18d06d234d18ab8f7b264c4bd045651eb7908fa3850974b6560c7fb34af3 TERMUX_PKG_SRCURL=https://github.com/termux/termux-apt-repo/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true # binutils for ar: TERMUX_PKG_DEPENDS="binutils, python, tar" diff --git a/packages/termux-create-package/build.sh b/packages/termux-create-package/build.sh index 8b7775c1ef..ceee42c514 100644 --- a/packages/termux-create-package/build.sh +++ b/packages/termux-create-package/build.sh @@ -5,8 +5,8 @@ TERMUX_PKG_VERSION=0.7 TERMUX_PKG_SHA256=e318edf152b01b19306b9f591104e50c6131f08db50694aa16ddade196400f5f TERMUX_PKG_SRCURL=https://github.com/termux/termux-create-package/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="python" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { cp termux-create-package $TERMUX_PREFIX/bin/termux-create-package diff --git a/packages/termux-elf-cleaner/build.sh b/packages/termux-elf-cleaner/build.sh index 5eb1f91de9..cb5ca9b4fb 100644 --- a/packages/termux-elf-cleaner/build.sh +++ b/packages/termux-elf-cleaner/build.sh @@ -9,4 +9,4 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/termux/termux-elf-cleaner/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=94ea8ed64c57f8222ebf933e960be97030a903395d750b499eb792892e0d836f TERMUX_PKG_DEPENDS="libc++" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/termux-exec/build.sh b/packages/termux-exec/build.sh index 59794e7af1..27d20cf4e6 100644 --- a/packages/termux-exec/build.sh +++ b/packages/termux-exec/build.sh @@ -5,5 +5,5 @@ TERMUX_PKG_VERSION=0.4 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/termux/termux-exec/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=9a8d42d211a7d461d61dcd4e3ef984014c2c2c696cfd6394bae389af13572627 -TERMUX_PKG_ESSENTIAL=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_ESSENTIAL=true +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/termux-keyring/build.sh b/packages/termux-keyring/build.sh index 18c4a737fd..adf3fb7c13 100644 --- a/packages/termux-keyring/build.sh +++ b/packages/termux-keyring/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux TERMUX_PKG_DESCRIPTION="GPG public keys for the official Termux repositories" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=1.2 -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/etc/apt/trusted.gpg.d diff --git a/packages/termux-licenses/build.sh b/packages/termux-licenses/build.sh index 2aa9f596d8..bbc33b34a4 100644 --- a/packages/termux-licenses/build.sh +++ b/packages/termux-licenses/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://termux.com TERMUX_PKG_DESCRIPTION="Contains LICENSE files for common licenses" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=1.0 -TERMUX_PKG_PLATFORM_INDEPENDENT=yes -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true +TERMUX_PKG_ESSENTIAL=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/LICENSES diff --git a/packages/termux-services/build.sh b/packages/termux-services/build.sh index 4857852e7c..388fc640fd 100644 --- a/packages/termux-services/build.sh +++ b/packages/termux-services/build.sh @@ -5,5 +5,5 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_SRCURL=https://github.com/termux/termux-services/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=5cb368761401b26e15529f113c8ce0b8e735fa0e911269fb7476cb8d42223c95 TERMUX_PKG_DEPENDS="busybox, coreutils" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh index 9fc0b5e946..3a2573e9e5 100644 --- a/packages/termux-tools/build.sh +++ b/packages/termux-tools/build.sh @@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="Basic system tools for Termux" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=0.69 TERMUX_PKG_REVISION=2 -TERMUX_PKG_PLATFORM_INDEPENDENT=yes -TERMUX_PKG_ESSENTIAL=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true +TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_CONFFILES="etc/motd" TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)" diff --git a/packages/texlive-tlmgr/build.sh b/packages/texlive-tlmgr/build.sh index 0e332c3eba..e331de9696 100644 --- a/packages/texlive-tlmgr/build.sh +++ b/packages/texlive-tlmgr/build.sh @@ -9,8 +9,8 @@ TERMUX_PKG_SHA256=44aa41b5783e345b7021387f19ac9637ff1ce5406a59754230c666642dfe77 TERMUX_PKG_DEPENDS="perl, wget, gnupg (>= 2.2.9-1), xz-utils, texlive (>= 20190410)" TERMUX_PKG_CONFFILES="share/texlive/tlpkg/texlive.tlpdb" TERMUX_PKG_CONFLICTS="texlive (<< 20180414-1)" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true +TERMUX_PKG_BUILD_IN_SRC=true TL_ROOT=$TERMUX_PREFIX/share/texlive TL_BINDIR=$TERMUX_PREFIX/bin @@ -18,7 +18,7 @@ TL_BINDIR=$TERMUX_PREFIX/bin termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi } diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh index 1d6a127e49..21dab74d58 100644 --- a/packages/texlive/build.sh +++ b/packages/texlive/build.sh @@ -10,9 +10,9 @@ TERMUX_PKG_DEPENDS="perl, texlive-bin (>= 20190410)" TERMUX_PKG_CONFLICTS="texlive (<< 20170524-5), texlive-bin (<< 20190410), texlive-tlmgr (<< 20190410)" TERMUX_PKG_REPLACES="texlive-bin (<< 20190410), texlive-tlmgr (<< 20190410)" TERMUX_PKG_RECOMMENDS="texlive-tlmgr" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes -TERMUX_PKG_HAS_DEBUG=no -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true +TERMUX_PKG_HAS_DEBUG=false +TERMUX_PKG_BUILD_IN_SRC=true TL_ROOT=$TERMUX_PREFIX/share/texlive TL_BINDIR=$TERMUX_PREFIX/bin diff --git a/packages/tig/build.sh b/packages/tig/build.sh index cc991c32d0..6abd380c8f 100644 --- a/packages/tig/build.sh +++ b/packages/tig/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.4.1 TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=b6b6aa183e571224d0e1fab3ec482542c1a97fa7a85b26352dc31dbafe8558b8 TERMUX_PKG_SRCURL=https://github.com/jonas/tig/releases/download/tig-$TERMUX_PKG_VERSION/tig-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libiconv, ncurses, git, libandroid-support" termux_step_post_make_install() { diff --git a/packages/tintin++/build.sh b/packages/tintin++/build.sh index 18d00429fe..27bd6e7238 100644 --- a/packages/tintin++/build.sh +++ b/packages/tintin++/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tintin/TinTin%2B%2B% TERMUX_PKG_SHA256=5af851ca3b143ab1f5144ded44453d64fc8abb4baac5bc1e7195a013bd40cf14 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_file__dev_ptmx=no" TERMUX_PKG_DEPENDS="pcre, libgnutls, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_extract_package() { TERMUX_PKG_SRCDIR+="/src" diff --git a/packages/tinyscheme/build.sh b/packages/tinyscheme/build.sh index d3ac533a1f..6014fe1140 100644 --- a/packages/tinyscheme/build.sh +++ b/packages/tinyscheme/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.41 TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tinyscheme/tinyscheme/tinyscheme-1.41/tinyscheme-1.41.tar.gz TERMUX_PKG_SHA256=eac0103494c755192b9e8f10454d9f98f2bbd4d352e046f7b253439a3f991999 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { AR+=" crs" diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh index 931ba73b59..fab47090ee 100644 --- a/packages/tmux/build.sh +++ b/packages/tmux/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/tmux/tmux/releases/download/${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=839d167a4517a6bffa6b6074e89a9a8630547b2dea2086f1fad15af12ab23b25 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-static" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_CONFFILES="etc/tmux.conf" diff --git a/packages/toilet/build.sh b/packages/toilet/build.sh index d4eea2524a..28a0ae716d 100644 --- a/packages/toilet/build.sh +++ b/packages/toilet/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://fossies.org/linux/privat/toilet-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=89d4b530c394313cc3f3a4e07a7394fa82a6091f44df44dfcd0ebcb3300a81de TERMUX_PKG_DEPENDS="libcaca" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/tracepath/build.sh b/packages/tracepath/build.sh index 2be573fbb5..63d2d468dd 100644 --- a/packages/tracepath/build.sh +++ b/packages/tracepath/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=20190709 TERMUX_PKG_SRCURL=https://github.com/iputils/iputils/archive/s${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { return diff --git a/packages/tree/build.sh b/packages/tree/build.sh index 10d8b1b703..0d98f265fe 100644 --- a/packages/tree/build.sh +++ b/packages/tree/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2 TERMUX_PKG_SRCURL=http://mama.indstate.edu/users/ice/tree/src/tree-${TERMUX_PKG_VERSION}.tgz TERMUX_PKG_DEPENDS="libandroid-support" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { make \ diff --git a/packages/tsocks/build.sh b/packages/tsocks/build.sh index f613151829..e651d71e77 100644 --- a/packages/tsocks/build.sh +++ b/packages/tsocks/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tsocks/tsocks/1.8%20beta%205/tsocks-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-conf=$TERMUX_PREFIX/etc/tsocks.conf" termux_step_post_extract_package() { diff --git a/packages/tsu/build.sh b/packages/tsu/build.sh index 203c547f99..82ed431aaf 100644 --- a/packages/tsu/build.sh +++ b/packages/tsu/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/cswl/tsu TERMUX_PKG_DESCRIPTION="A su wrapper for Termux" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_VERSION=2.3 -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_SKIP_SRC_EXTRACT=1 -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_extract_package() { local CHECKED_OUT_FOLDER=$TERMUX_PKG_CACHEDIR/tsu-checkout-$TERMUX_PKG_VERSION diff --git a/packages/tty-clock/build.sh b/packages/tty-clock/build.sh index 649e32865a..de9294a5d2 100644 --- a/packages/tty-clock/build.sh +++ b/packages/tty-clock/build.sh @@ -6,4 +6,4 @@ TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_SRCURL=https://github.com/xorg62/tty-clock/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=343e119858db7d5622a545e15a3bbfde65c107440700b62f9df0926db8f57984 TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/ttyrec/build.sh b/packages/ttyrec/build.sh index 56f9437a9d..745d55634d 100644 --- a/packages/ttyrec/build.sh +++ b/packages/ttyrec/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.0.8 TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=http://0xcc.net/ttyrec/ttyrec-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { CFLAGS+=" -Dset_progname=setprogname $LDFLAGS" diff --git a/packages/units/build.sh b/packages/units/build.sh index b45805e53b..5066ee7c38 100644 --- a/packages/units/build.sh +++ b/packages/units/build.sh @@ -5,4 +5,4 @@ TERMUX_PKG_VERSION=2.19 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/units/units-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=4262136bdfc152b63ff5a9b93a7d80ce18b5e8bebdcffddc932dda769e306556 TERMUX_PKG_DEPENDS="readline, libandroid-support" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/unrar/build.sh b/packages/unrar/build.sh index c732133d95..7ad7757dfc 100644 --- a/packages/unrar/build.sh +++ b/packages/unrar/build.sh @@ -7,4 +7,4 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e1c2fddaa87a88b1535bfc10ca484f3c5af4e5a55fbb933f8819e26203bbe2ee TERMUX_PKG_DEPENDS="libandroid-support, libc++" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/unstable-repo/build.sh b/packages/unstable-repo/build.sh index 3ded9a38e5..41773489bd 100644 --- a/packages/unstable-repo/build.sh +++ b/packages/unstable-repo/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=2.0 TERMUX_PKG_DEPENDS="termux-keyring" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d diff --git a/packages/unzip/build.sh b/packages/unzip/build.sh index 4a4a4469a6..178af6c9b0 100644 --- a/packages/unzip/build.sh +++ b/packages/unzip/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/infozip/unzip60.tar.gz TERMUX_PKG_SHA256=036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 TERMUX_PKG_DEPENDS="libbz2" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { cp unix/Makefile Makefile diff --git a/packages/utf8cpp/build.sh b/packages/utf8cpp/build.sh index 0928adca9a..e9811d3278 100644 --- a/packages/utf8cpp/build.sh +++ b/packages/utf8cpp/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.3.5 TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f3ffe0ef6c02f48ebafe42369cbd741e844143baad27c13baad1cd14b863983d TERMUX_PKG_SRCURL=https://github.com/nemtrif/utfcpp/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { return 0; diff --git a/packages/utf8proc/build.sh b/packages/utf8proc/build.sh index 44244c5f83..617bcb7b8d 100644 --- a/packages/utf8proc/build.sh +++ b/packages/utf8proc/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=b2e5d547c1d94762a6d03a7e05cea46092aab68636460ff8648f1295e2cdfb TERMUX_PKG_BREAKS="utf8proc-dev" TERMUX_PKG_REPLACES="utf8proc-dev" TERMUX_PKG_SRCURL=https://github.com/JuliaLang/utf8proc/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { rm $TERMUX_PKG_SRCDIR/CMakeLists.txt diff --git a/packages/vcsh/build.sh b/packages/vcsh/build.sh index 2d1fa10119..ce2836ffc5 100644 --- a/packages/vcsh/build.sh +++ b/packages/vcsh/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.20151229 TERMUX_PKG_SHA256=ae069506b0490287aefa582ab4e6af1c7ebc4dca743b17d91e0c8d0327d7a3fa TERMUX_PKG_SRCURL=https://github.com/RichiH/vcsh/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="git" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_EXTRA_MAKE_ARGS="all=" diff --git a/packages/vifm/build.sh b/packages/vifm/build.sh index b66e984bf3..1736e9924b 100644 --- a/packages/vifm/build.sh +++ b/packages/vifm/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="ncurses, file" termux_step_pre_configure() { autoreconf -if - if [ "$TERMUX_DEBUG" == "true" ]; then + if $TERMUX_DEBUG; then # Debug build fails with: # /home/builder/.termux-build/vifm/src/src/fops_common.c:745:27: error: 'umask' called with invalid mode # saved_umask = umask(~0600); diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index 55fc3fcb69..7c9ef4b952 100644 --- a/packages/vim-python/build.sh +++ b/packages/vim-python/build.sh @@ -23,7 +23,7 @@ vim_cv_tty_group=world --without-x --with-tlib=ncursesw " -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL=" bin/rview bin/rvim @@ -54,7 +54,7 @@ termux_step_pre_configure() { termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/vim/build.sh b/packages/vim/build.sh index 221caf5f59..8bdb7a546d 100644 --- a/packages/vim/build.sh +++ b/packages/vim/build.sh @@ -23,7 +23,7 @@ vim_cv_tty_group=world --without-x --with-tlib=ncursesw " -TERMUX_PKG_BUILD_IN_SRC="yes" +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL=" bin/rview bin/rvim @@ -41,7 +41,7 @@ TERMUX_PKG_CONFLICTS="vim-python" termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/w3m/build.sh b/packages/w3m/build.sh index a82908226c..4e314e6da5 100644 --- a/packages/w3m/build.sh +++ b/packages/w3m/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=0467bb5429b75749205a3f57b9f5e8abba49929272aeab6fce94ff17953f07 # The upstream w3m project is dead, but every linux distribution uses # this maintained fork in debian: TERMUX_PKG_SRCURL=https://github.com/tats/w3m/archive/v${_MAJOR_VERSION}+git${_MINOR_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libgc, ncurses, openssl, zlib" # ac_cv_func_bcopy=yes to avoid w3m defining it's own bcopy function, which # breaks 64-bit builds where NDK headers define bcopy as a macro: diff --git a/packages/wireguard-tools/build.sh b/packages/wireguard-tools/build.sh index b7af9b9e0d..9cdecb3152 100644 --- a/packages/wireguard-tools/build.sh +++ b/packages/wireguard-tools/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.0.20190702 TERMUX_PKG_SRCURL=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=1a1311bc71abd47a72c47d918be3bacc486b3de90734661858af75cc990dbaac TERMUX_PKG_DEPENDS="libmnl, tsu" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src/tools WITH_BASHCOMPLETION=yes WITH_WGQUICK=no WITH_SYSTEMDUNITS=no" termux_step_post_make_install() { diff --git a/packages/wordgrinder/build.sh b/packages/wordgrinder/build.sh index 446778a0e4..e772baf7d4 100644 --- a/packages/wordgrinder/build.sh +++ b/packages/wordgrinder/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/davidgiven/wordgrinder/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=4e1bc659403f98479fe8619655f901c8c03eb87743374548b4d20a41d31d1dff TERMUX_PKG_DEPENDS="liblua, ncurses, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_ninja diff --git a/packages/x11-repo/build.sh b/packages/x11-repo/build.sh index 78bbc6e730..da401195d4 100644 --- a/packages/x11-repo/build.sh +++ b/packages/x11-repo/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=2.0 TERMUX_PKG_DEPENDS="termux-keyring" -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d diff --git a/packages/xmlstarlet/build.sh b/packages/xmlstarlet/build.sh index 82ff61d2dc..de111a8c90 100644 --- a/packages/xmlstarlet/build.sh +++ b/packages/xmlstarlet/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/${ TERMUX_PKG_SHA256=15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca TERMUX_PKG_DEPENDS="libxslt, libxml2" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-libxml-include-prefix=${TERMUX_PREFIX}/include/libxml2" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_make_install() { ln -sfr $TERMUX_PREFIX/bin/xml $TERMUX_PREFIX/bin/xmlstarlet diff --git a/packages/xorriso/build.sh b/packages/xorriso/build.sh index 80dfb9df60..4efbc0dacd 100644 --- a/packages/xorriso/build.sh +++ b/packages/xorriso/build.sh @@ -6,5 +6,5 @@ TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=a93fa7ae5bb1902198cddfec25201388156932f36f2f5da829bf4fcae9a6062b TERMUX_PKG_SRCURL=https://www.gnu.org/software/xorriso/xorriso-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libiconv, libandroid-support, readline, libbz2, zlib" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-jtethreads" diff --git a/packages/xvidcore/build.sh b/packages/xvidcore/build.sh index edd31c963c..8d35876271 100644 --- a/packages/xvidcore/build.sh +++ b/packages/xvidcore/build.sh @@ -7,12 +7,12 @@ TERMUX_PKG_SHA256=165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894c TERMUX_PKG_BREAKS="xvidcore-dev" TERMUX_PKG_REPLACES="xvidcore-dev" TERMUX_PKG_SRCURL=http://downloads.xvid.org/downloads/xvidcore-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/yarn/build.sh b/packages/yarn/build.sh index 57a8dae0a3..e1a288e84e 100644 --- a/packages/yarn/build.sh +++ b/packages/yarn/build.sh @@ -6,8 +6,8 @@ TERMUX_PKG_VERSION=1.17.3 TERMUX_PKG_SRCURL=https://yarnpkg.com/downloads/${TERMUX_PKG_VERSION}/yarn-v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e3835194409f1b3afa1c62ca82f561f1c29d26580c9e220c36866317e043c6f3 TERMUX_PKG_DEPENDS="nodejs | nodejs-lts" -TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_PLATFORM_INDEPENDENT=yes +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { cp -r . ${TERMUX_PREFIX}/share/yarn/ diff --git a/packages/zile/build.sh b/packages/zile/build.sh index 2bf30208a9..65de8da5a4 100644 --- a/packages/zile/build.sh +++ b/packages/zile/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/zile/zile-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74 TERMUX_PKG_DEPENDS="libgc, ncurses" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_configure() { # zile uses help2man to build the zile.1 man page, which would require diff --git a/packages/zip/build.sh b/packages/zip/build.sh index f8ace27369..3fd1ddde7e 100644 --- a/packages/zip/build.sh +++ b/packages/zip/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/infozip/zip30.tar.gz TERMUX_PKG_SHA256=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 TERMUX_PKG_DEPENDS="libandroid-support, libbz2" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { cp unix/Makefile Makefile diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh index e804447776..4b651cd4a3 100644 --- a/packages/zsh/build.sh +++ b/packages/zsh/build.sh @@ -16,12 +16,12 @@ ac_cv_func_getpwuid=yes --enable-etcdir=$TERMUX_PREFIX/etc " TERMUX_PKG_CONFFILES="etc/zshrc" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_configure() { # Certain packages are not safe to build on device because their # build.sh script deletes specific files in $TERMUX_PREFIX. - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." fi diff --git a/packages/zstd/build.sh b/packages/zstd/build.sh index 73abd6161b..4efb176201 100644 --- a/packages/zstd/build.sh +++ b/packages/zstd/build.sh @@ -8,4 +8,4 @@ TERMUX_PKG_SHA256=7a6e1dad34054b35e2e847eb3289be8820a5d378228802239852f913c6dcf6 TERMUX_PKG_DEPENDS="liblzma, zlib" TERMUX_PKG_BREAKS="zstd-dev" TERMUX_PKG_REPLACES="zstd-dev" -TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/scripts/build/configure/termux_step_configure.sh b/scripts/build/configure/termux_step_configure.sh index 80b5c7a618..8647fe8c14 100644 --- a/scripts/build/configure/termux_step_configure.sh +++ b/scripts/build/configure/termux_step_configure.sh @@ -1,5 +1,5 @@ termux_step_configure() { - if [ "$TERMUX_PKG_FORCE_CMAKE" == 'no' ] && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then + if ! ${TERMUX_PKG_FORCE_CMAKE-false} && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then termux_step_configure_autotools elif [ -f "$TERMUX_PKG_SRCDIR/CMakeLists.txt" ]; then termux_step_configure_cmake diff --git a/scripts/build/configure/termux_step_configure_autotools.sh b/scripts/build/configure/termux_step_configure_autotools.sh index c9bac50530..9c03cc6cdc 100644 --- a/scripts/build/configure/termux_step_configure_autotools.sh +++ b/scripts/build/configure/termux_step_configure_autotools.sh @@ -32,7 +32,7 @@ termux_step_configure_autotools() { QUIET_BUILD="--enable-silent-rules --silent --quiet" fi - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then # Some packages provides a $PKG-config script which some configure scripts pickup instead of pkg-config: mkdir "$TERMUX_PKG_TMPDIR/config-scripts" for f in $TERMUX_PREFIX/bin/*config; do diff --git a/scripts/build/configure/termux_step_configure_cmake.sh b/scripts/build/configure/termux_step_configure_cmake.sh index eb6f89d3a9..7c8bb5377b 100644 --- a/scripts/build/configure/termux_step_configure_cmake.sh +++ b/scripts/build/configure/termux_step_configure_cmake.sh @@ -2,7 +2,7 @@ termux_step_configure_cmake() { termux_setup_cmake local BUILD_TYPE=MinSizeRel - test -n "$TERMUX_DEBUG" && BUILD_TYPE=Debug + $TERMUX_DEBUG && BUILD_TYPE=Debug local CMAKE_PROC=$TERMUX_ARCH test $CMAKE_PROC == "arm" && CMAKE_PROC='armv7-a' @@ -18,7 +18,7 @@ termux_step_configure_cmake() { CFLAGS+=" -fno-addrsig" local CMAKE_ADDITIONAL_ARGS=() - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then CXXFLAGS+=" --target=$CCTERMUX_HOST_PLATFORM" CFLAGS+=" --target=$CCTERMUX_HOST_PLATFORM" LDFLAGS+=" --target=$CCTERMUX_HOST_PLATFORM" diff --git a/scripts/build/setup/termux_setup_cmake.sh b/scripts/build/setup/termux_setup_cmake.sh index 331fdba456..4190dc741a 100644 --- a/scripts/build/setup/termux_setup_cmake.sh +++ b/scripts/build/setup/termux_setup_cmake.sh @@ -6,7 +6,7 @@ termux_setup_cmake() { local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME local TERMUX_CMAKE_FOLDER=$TERMUX_COMMON_CACHEDIR/cmake-$TERMUX_CMAKE_VERSION - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \ "$TERMUX_CMAKE_TARFILE" \ diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh index bcca976f1c..5afe2d7791 100644 --- a/scripts/build/setup/termux_setup_golang.sh +++ b/scripts/build/setup/termux_setup_golang.sh @@ -19,7 +19,7 @@ termux_setup_golang() { termux_error_exit "Unsupported arch: $TERMUX_ARCH" fi - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then local TERMUX_GO_VERSION=go1.12.7 local TERMUX_GO_PLATFORM=linux-amd64 diff --git a/scripts/build/setup/termux_setup_ninja.sh b/scripts/build/setup/termux_setup_ninja.sh index 7b17e05e41..ea2947eb57 100644 --- a/scripts/build/setup/termux_setup_ninja.sh +++ b/scripts/build/setup/termux_setup_ninja.sh @@ -2,7 +2,7 @@ termux_setup_ninja() { local NINJA_VERSION=1.9.0 local NINJA_FOLDER=$TERMUX_COMMON_CACHEDIR/ninja-$NINJA_VERSION - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then if [ ! -x "$NINJA_FOLDER/ninja" ]; then mkdir -p "$NINJA_FOLDER" local NINJA_ZIP_FILE=$TERMUX_PKG_TMPDIR/ninja-$NINJA_VERSION.zip diff --git a/scripts/build/setup/termux_setup_protobuf.sh b/scripts/build/setup/termux_setup_protobuf.sh index 8c47592e7a..9e106bbc46 100644 --- a/scripts/build/setup/termux_setup_protobuf.sh +++ b/scripts/build/setup/termux_setup_protobuf.sh @@ -3,7 +3,7 @@ termux_setup_protobuf() { local _PROTOBUF_ZIP=protoc-$_PROTOBUF_VERSION-linux-x86_64.zip local _PROTOBUF_FOLDER=$TERMUX_COMMON_CACHEDIR/protobuf-$_PROTOBUF_VERSION - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then if [ ! -d "$_PROTOBUF_FOLDER" ]; then termux_download \ https://github.com/protocolbuffers/protobuf/releases/download/v$_PROTOBUF_VERSION/$_PROTOBUF_ZIP \ diff --git a/scripts/build/setup/termux_setup_rust.sh b/scripts/build/setup/termux_setup_rust.sh index aee7755a0c..7134d4f04b 100644 --- a/scripts/build/setup/termux_setup_rust.sh +++ b/scripts/build/setup/termux_setup_rust.sh @@ -7,7 +7,7 @@ termux_setup_rust() { export RUSTFLAGS="-C link-arg=-Wl,-rpath=$TERMUX_PREFIX/lib -C link-arg=-Wl,--enable-new-dtags" - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then if [ "$(dpkg-query -W -f '${db:Status-Status}\n' rust 2>/dev/null)" != "installed" ]; then echo "Package 'rust' is not installed." echo "You can install it with" diff --git a/scripts/build/termux_create_subpackages.sh b/scripts/build/termux_create_subpackages.sh index 8a32ee2af1..fe84a1ffd3 100644 --- a/scripts/build/termux_create_subpackages.sh +++ b/scripts/build/termux_create_subpackages.sh @@ -1,6 +1,6 @@ termux_create_subpackages() { # Sub packages: - if [[ -n $(shopt -s nullglob; echo lib/*.a) ]] && [ -z "${TERMUX_PKG_NO_STATICSPLIT}" ]; then + if ! ${TERMUX_PKG_NO_STATICSPLIT-false} && [[ -n $(shopt -s nullglob; echo lib/*.a) ]]; then # Add virtual -static sub package if there are include files: local _STATIC_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-static.subpackage.sh echo TERMUX_SUBPKG_INCLUDE=\"lib/**/*.a lib/**/*.la\" > "$_STATIC_SUBPACKAGE_FILE" @@ -16,7 +16,7 @@ termux_create_subpackages() { # Default value is same as main package, but sub package may override: local TERMUX_SUBPKG_PLATFORM_INDEPENDENT=$TERMUX_PKG_PLATFORM_INDEPENDENT local SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME - local TERMUX_SUBPKG_ESSENTIAL="" + local TERMUX_SUBPKG_ESSENTIAL=false local TERMUX_SUBPKG_BREAKS="" local TERMUX_SUBPKG_DEPENDS="" local TERMUX_SUBPKG_CONFLICTS="" @@ -46,7 +46,7 @@ termux_create_subpackages() { shopt -u globstar local SUB_PKG_ARCH=$TERMUX_ARCH - test -n "$TERMUX_SUBPKG_PLATFORM_INDEPENDENT" && SUB_PKG_ARCH=all + ${TERMUX_SUBPKG_PLATFORM_INDEPENDENT-false} && SUB_PKG_ARCH=all cd "$SUB_PKG_DIR/massage" local SUB_PKG_INSTALLSIZE @@ -75,7 +75,7 @@ termux_create_subpackages() { TERMUX_SUBPKG_DEPENDS+=", $TERMUX_PKG_DEPENDS" fi - test ! -z "$TERMUX_SUBPKG_ESSENTIAL" && echo "Essential: yes" >> control + ${TERMUX_SUBPKG_ESSENTIAL-false} && echo "Essential: yes" >> control test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: ${TERMUX_SUBPKG_DEPENDS/#, /}" >> control test ! -z "$TERMUX_SUBPKG_BREAKS" && echo "Breaks: $TERMUX_SUBPKG_BREAKS" >> control test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control diff --git a/scripts/build/termux_download_deb.sh b/scripts/build/termux_download_deb.sh index e34a9b42ba..4a4afd6b08 100755 --- a/scripts/build/termux_download_deb.sh +++ b/scripts/build/termux_download_deb.sh @@ -3,7 +3,7 @@ termux_download_deb() { local PACKAGE_ARCH=$2 local VERSION=$3 - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then apt install -y "${PACKAGE}=${VERSION}" return "$?" fi diff --git a/scripts/build/termux_extract_dep_info.sh b/scripts/build/termux_extract_dep_info.sh index af301c2586..0ded52ed3c 100755 --- a/scripts/build/termux_extract_dep_info.sh +++ b/scripts/build/termux_extract_dep_info.sh @@ -5,13 +5,13 @@ termux_extract_dep_info() { # We are dealing with a subpackage TERMUX_ARCH=$( # set TERMUX_SUBPKG_PLATFORM_INDEPENDENT to parent package's value and override if needed - TERMUX_PKG_PLATFORM_INDEPENDENT="" + TERMUX_PKG_PLATFORM_INDEPENDENT=false source ${PKG_DIR}/build.sh TERMUX_SUBPKG_PLATFORM_INDEPENDENT=$TERMUX_PKG_PLATFORM_INDEPENDENT - if [ "$TERMUX_INSTALL_DEPS" = false ] || [ -n "${TERMUX_PKG_NO_STATICSPLIT}" ] || [ "${PKG/-static/}-static" != "${PKG}" ]; then + if ! $TERMUX_INSTALL_DEPS || ${TERMUX_PKG_NO_STATICSPLIT-false} ] || [ "${PKG/-static/}-static" != "${PKG}" ]; then source ${PKG_DIR}/${PKG}.subpackage.sh fi - if [ "$TERMUX_SUBPKG_PLATFORM_INDEPENDENT" = yes ]; then + if ${TERMUX_SUBPKG_PLATFORM_INDEPENDENT-false}; then echo all else echo $TERMUX_ARCH @@ -26,10 +26,10 @@ termux_extract_dep_info() { # Reset TERMUX_PKG_PLATFORM_INDEPENDENT and TERMUX_PKG_REVISION since these aren't # mandatory in a build.sh. Otherwise these will equal the main package's values for # deps that should have the default values - TERMUX_PKG_PLATFORM_INDEPENDENT="" + TERMUX_PKG_PLATFORM_INDEPENDENT=false TERMUX_PKG_REVISION="0" source ${PKG_DIR}/build.sh - if [ "$TERMUX_PKG_PLATFORM_INDEPENDENT" = yes ]; then TERMUX_ARCH=all; fi + ${TERMUX_PKG_PLATFORM_INDEPENDENT-false} && TERMUX_ARCH=all if [ "$TERMUX_PKG_REVISION" != "0" ] || [ "$TERMUX_PKG_VERSION" != "${TERMUX_PKG_VERSION/-/}" ]; then TERMUX_PKG_VERSION+="-$TERMUX_PKG_REVISION" fi diff --git a/scripts/build/termux_get_repo_files.sh b/scripts/build/termux_get_repo_files.sh index 9deb8b853b..b1a91ebb8a 100644 --- a/scripts/build/termux_get_repo_files.sh +++ b/scripts/build/termux_get_repo_files.sh @@ -1,6 +1,6 @@ termux_get_repo_files() { # Not needed for on-device builds. - [ -n "$TERMUX_ON_DEVICE_BUILD" ] && return + $TERMUX_ON_DEVICE_BUILD && return # Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build) mkdir -p "$TERMUX_COMMON_CACHEDIR" \ diff --git a/scripts/build/termux_step_create_debfile.sh b/scripts/build/termux_step_create_debfile.sh index 9463cb3b5a..cd2fb9421d 100644 --- a/scripts/build/termux_step_create_debfile.sh +++ b/scripts/build/termux_step_create_debfile.sh @@ -4,7 +4,7 @@ termux_step_create_debfile() { TERMUX_PKG_INSTALLSIZE=$(du -sk . | cut -f 1) # From here on TERMUX_ARCH is set to "all" if TERMUX_PKG_PLATFORM_INDEPENDENT is set by the package - test -n "$TERMUX_PKG_PLATFORM_INDEPENDENT" && TERMUX_ARCH=all + ${TERMUX_PKG_PLATFORM_INDEPENDENT-false} && TERMUX_ARCH=all mkdir -p DEBIAN cat > DEBIAN/control <<-HERE @@ -18,7 +18,7 @@ termux_step_create_debfile() { test ! -z "$TERMUX_PKG_BREAKS" && echo "Breaks: $TERMUX_PKG_BREAKS" >> DEBIAN/control test ! -z "$TERMUX_PKG_PRE_DEPENDS" && echo "Pre-Depends: $TERMUX_PKG_PRE_DEPENDS" >> DEBIAN/control test ! -z "$TERMUX_PKG_DEPENDS" && echo "Depends: $TERMUX_PKG_DEPENDS" >> DEBIAN/control - test ! -z "$TERMUX_PKG_ESSENTIAL" && echo "Essential: yes" >> DEBIAN/control + ${TERMUX_PKG_ESSENTIAL-false} && echo "Essential: yes" >> DEBIAN/control test ! -z "$TERMUX_PKG_CONFLICTS" && echo "Conflicts: $TERMUX_PKG_CONFLICTS" >> DEBIAN/control test ! -z "$TERMUX_PKG_RECOMMENDS" && echo "Recommends: $TERMUX_PKG_RECOMMENDS" >> DEBIAN/control test ! -z "$TERMUX_PKG_REPLACES" && echo "Replaces: $TERMUX_PKG_REPLACES" >> DEBIAN/control diff --git a/scripts/build/termux_step_handle_buildarch.sh b/scripts/build/termux_step_handle_buildarch.sh index 43b89e843a..811136eccd 100644 --- a/scripts/build/termux_step_handle_buildarch.sh +++ b/scripts/build/termux_step_handle_buildarch.sh @@ -1,5 +1,5 @@ termux_step_handle_buildarch() { - [ -n "$TERMUX_ON_DEVICE_BUILD" ] && return + $TERMUX_ON_DEVICE_BUILD && return # If $TERMUX_PREFIX already exists, it may have been built for a different arch local TERMUX_ARCH_FILE=/data/TERMUX_ARCH diff --git a/scripts/build/termux_step_handle_hostbuild.sh b/scripts/build/termux_step_handle_hostbuild.sh index ea1563bcc6..cfd9070fe3 100644 --- a/scripts/build/termux_step_handle_hostbuild.sh +++ b/scripts/build/termux_step_handle_hostbuild.sh @@ -1,5 +1,5 @@ termux_step_handle_hostbuild() { - if [ "x$TERMUX_PKG_HOSTBUILD" = "x" ]; then return; fi + if ! ${TERMUX_PKG_HOSTBUILD-false}; then return; fi cd "$TERMUX_PKG_SRCDIR" for patch in $TERMUX_PKG_BUILDER_DIR/*.patch.beforehostbuild; do diff --git a/scripts/build/termux_step_massage.sh b/scripts/build/termux_step_massage.sh index 61d7521507..9485b3da79 100644 --- a/scripts/build/termux_step_massage.sh +++ b/scripts/build/termux_step_massage.sh @@ -16,7 +16,7 @@ termux_step_massage() { # Remove world permissions and make sure that user still have read-write permissions. chmod -Rf u+rw,g-rwx,o-rwx . || true - if [ "$TERMUX_DEBUG" = "" ]; then + if ! $TERMUX_DEBUG; then # Strip binaries. file(1) may fail for certain unusual files, so disable pipefail. set +e +o pipefail find . \( -path "./bin/*" -o -path "./lib/*" -o -path "./libexec/*" \) -type f | \ diff --git a/scripts/build/termux_step_patch_package.sh b/scripts/build/termux_step_patch_package.sh index 52da302427..0d1862d804 100644 --- a/scripts/build/termux_step_patch_package.sh +++ b/scripts/build/termux_step_patch_package.sh @@ -1,7 +1,7 @@ termux_step_patch_package() { cd "$TERMUX_PKG_SRCDIR" local DEBUG_PATCHES="" - if [ "$TERMUX_DEBUG" == "true" ] && [ -f $TERMUX_PKG_BUILDER_DIR/*.patch.debug ] ; then + if $TERMUX_DEBUG && [ -f $TERMUX_PKG_BUILDER_DIR/*.patch.debug ] ; then DEBUG_PATCHES="$(ls $TERMUX_PKG_BUILDER_DIR/*.patch.debug)" fi # Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses: diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index dd6b1ea3b3..d25065491e 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -14,7 +14,7 @@ termux_step_setup_toolchain() { export READELF=$TERMUX_HOST_PLATFORM-readelf export STRIP=$TERMUX_HOST_PLATFORM-strip - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then export PATH=$TERMUX_STANDALONE_TOOLCHAIN/bin:$PATH export CC_FOR_BUILD=gcc export PKG_CONFIG=$TERMUX_STANDALONE_TOOLCHAIN/bin/${TERMUX_HOST_PLATFORM}-pkg-config @@ -56,7 +56,7 @@ termux_step_setup_toolchain() { CFLAGS+=" -fstack-protector-strong" LDFLAGS+=" -Wl,-z,relro,-z,now" - if [ -n "$TERMUX_DEBUG" ]; then + if $TERMUX_DEBUG; then CFLAGS+=" -g3 -O1 -D_FORTIFY_SOURCE=2" else CFLAGS+=" -Oz" @@ -76,7 +76,7 @@ termux_step_setup_toolchain() { export ac_cv_func_sigsetmask=no export ac_cv_c_bigendian=no - if [ -z "$TERMUX_ON_DEVICE_BUILD" ] && [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then + if ! $TERMUX_ON_DEVICE_BUILD && [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then # 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): local _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp @@ -173,7 +173,7 @@ termux_step_setup_toolchain() { export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR" - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then # Create a pkg-config wrapper. We use path to host pkg-config to # avoid picking up a cross-compiled pkg-config later on. local _HOST_PKGCONFIG diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh index 1a52fc405b..4c990eab4e 100644 --- a/scripts/build/termux_step_setup_variables.sh +++ b/scripts/build/termux_step_setup_variables.sh @@ -4,7 +4,7 @@ termux_step_setup_variables() { : "${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_DEBUG:="false"}" : "${TERMUX_PKG_API_LEVEL:="24"}" : "${TERMUX_NO_CLEAN:="false"}" : "${TERMUX_QUIET_BUILD:="false"}" @@ -13,7 +13,7 @@ termux_step_setup_variables() { : "${TERMUX_INSTALL_DEPS:="false"}" : "${TERMUX_PACKAGES_DIRECTORIES:="packages"}" - if [ -n "$TERMUX_ON_DEVICE_BUILD" ]; then + if $TERMUX_ON_DEVICE_BUILD; then # For on-device builds cross-compiling is not supported so we can # store information about built packages under $TERMUX_TOPDIR. TERMUX_BUILT_PACKAGES_DIRECTORY="$TERMUX_TOPDIR/.built-packages" @@ -73,11 +73,11 @@ termux_step_setup_variables() { TERMUX_HOST_PLATFORM="${TERMUX_ARCH}-linux-android" if [ "$TERMUX_ARCH" = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}eabi"; fi - if [ -z "$TERMUX_ON_DEVICE_BUILD" ] && [ ! -d "$NDK" ]; then + if ! $TERMUX_ON_DEVICE_BUILD && [ ! -d "$NDK" ]; then termux_error_exit 'NDK not pointing at a directory!' fi - if [ -z "$TERMUX_ON_DEVICE_BUILD" ] && ! grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION_NUM" "$NDK/source.properties"; then + if ! $TERMUX_ON_DEVICE_BUILD && ! grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION_NUM" "$NDK/source.properties"; then termux_error_exit "Wrong NDK version - we need $TERMUX_NDK_VERSION" fi @@ -103,13 +103,13 @@ termux_step_setup_variables() { TERMUX_PKG_SHA256="" TERMUX_PKG_TMPDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/tmp TERMUX_PKG_HOSTBUILD_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/host-build - TERMUX_PKG_PLATFORM_INDEPENDENT="" - TERMUX_PKG_NO_STATICSPLIT="" + TERMUX_PKG_PLATFORM_INDEPENDENT=false + TERMUX_PKG_NO_STATICSPLIT=false TERMUX_PKG_REVISION="0" # http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version TERMUX_PKG_EXTRA_CONFIGURE_ARGS="" TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="" TERMUX_PKG_EXTRA_MAKE_ARGS="" - TERMUX_PKG_BUILD_IN_SRC="" + TERMUX_PKG_BUILD_IN_SRC=false TERMUX_PKG_RM_AFTER_INSTALL="" TERMUX_PKG_BREAKS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps TERMUX_PKG_PRE_DEPENDS="" @@ -118,7 +118,7 @@ termux_step_setup_variables() { TERMUX_PKG_HOMEPAGE="" TERMUX_PKG_DESCRIPTION="FIXME:Add description" TERMUX_PKG_LICENSE_FILE="" # Relative path from $TERMUX_PKG_SRCDIR to LICENSE file. It is installed to $TERMUX_PREFIX/share/$TERMUX_PKG_NAME. - TERMUX_PKG_ESSENTIAL="" + TERMUX_PKG_ESSENTIAL=false TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts TERMUX_PKG_RECOMMENDS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps TERMUX_PKG_SUGGESTS="" @@ -126,10 +126,10 @@ termux_step_setup_variables() { TERMUX_PKG_PROVIDES="" #https://www.debian.org/doc/debian-policy/#virtual-packages-provides TERMUX_PKG_CONFFILES="" # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR: - TERMUX_PKG_HOSTBUILD="" - TERMUX_PKG_FORCE_CMAKE=no # if the package has autotools as well as cmake, then set this to prefer cmake + TERMUX_PKG_HOSTBUILD=false + TERMUX_PKG_FORCE_CMAKE=false # if the package has autotools as well as cmake, then set this to prefer cmake TERMUX_CMAKE_BUILD=Ninja # Which cmake generator to use - TERMUX_PKG_HAS_DEBUG=yes # set to no if debug build doesn't exist or doesn't work, for example for python based packages + TERMUX_PKG_HAS_DEBUG=true # set to false if debug build doesn't exist or doesn't work, for example for python based packages unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS } diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index dd19fdfbd8..9d5abe1146 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -18,8 +18,8 @@ termux_step_start_build() { TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_REVISION" fi - if [ "$TERMUX_DEBUG" = true ]; then - if [ "$TERMUX_PKG_HAS_DEBUG" == "yes" ]; then + if $TERMUX_DEBUG; then + if $TERMUX_PKG_HAS_DEBUG; then DEBUG="-dbg" else echo "Skipping building debug build for $TERMUX_PKG_NAME" @@ -29,12 +29,12 @@ termux_step_start_build() { DEBUG="" fi - if [ -z "$TERMUX_DEBUG" ] && [ -z "${TERMUX_FORCE_BUILD+x}" ]; then + if ! $TERMUX_DEBUG && ${TERMUX_FORCE_BUILD-false}; then if [ -e "$TERMUX_BUILT_PACKAGES_DIRECTORY/$TERMUX_PKG_NAME" ] && [ "$(cat "$TERMUX_BUILT_PACKAGES_DIRECTORY/$TERMUX_PKG_NAME")" = "$TERMUX_PKG_FULLVERSION" ]; then echo "$TERMUX_PKG_NAME@$TERMUX_PKG_FULLVERSION built - skipping (rm $TERMUX_BUILT_PACKAGES_DIRECTORY/$TERMUX_PKG_NAME to force rebuild)" exit 0 - elif [ -n "$TERMUX_ON_DEVICE_BUILD" ] && + elif $TERMUX_ON_DEVICE_BUILD && [ "$(dpkg-query -W -f '${db:Status-Status} ${Version}\n' "$TERMUX_PKG_NAME" 2>/dev/null)" = "installed $TERMUX_PKG_FULLVERSION" ]; then echo "$TERMUX_PKG_NAME@$TERMUX_PKG_FULLVERSION installed - skipping" exit 0 @@ -46,7 +46,7 @@ termux_step_start_build() { termux_get_repo_files # When doing build on device, ensure that apt lists are up-to-date. - [ -n "$TERMUX_ON_DEVICE_BUILD" ] && apt update + $TERMUX_ON_DEVICE_BUILD && apt update # Download dependencies while read PKG PKG_DIR; do @@ -74,7 +74,7 @@ termux_step_start_build() { TERMUX_BUILD_IGNORE_LOCK=true ./build-package.sh -I "${PKG_DIR}" continue else - if [ -z "$TERMUX_ON_DEVICE_BUILD" ]; then + if ! $TERMUX_ON_DEVICE_BUILD; then if [ ! "$TERMUX_QUIET_BUILD" = true ]; then echo "extracting $PKG..."; fi ( cd $TERMUX_COMMON_CACHEDIR-$DEP_ARCH @@ -125,7 +125,7 @@ termux_step_start_build() { # Make $TERMUX_PREFIX/bin/sh executable on the builder, so that build # scripts can assume that it works on both builder and host later on: - [ -z "$TERMUX_ON_DEVICE_BUILD" ] && ln -sf /bin/sh "$TERMUX_PREFIX/bin/sh" + ! $TERMUX_ON_DEVICE_BUILD && ln -sf /bin/sh "$TERMUX_PREFIX/bin/sh" local TERMUX_ELF_CLEANER_SRC=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner.cpp local TERMUX_ELF_CLEANER_VERSION @@ -139,8 +139,8 @@ termux_step_start_build() { "$TERMUX_ELF_CLEANER_SRC" -o "$TERMUX_ELF_CLEANER" fi - if [ -n "$TERMUX_PKG_BUILD_IN_SRC" ]; then - echo "Building in src due to TERMUX_PKG_BUILD_IN_SRC being set" > "$TERMUX_PKG_BUILDDIR/BUILDING_IN_SRC.txt" + if ${TERMUX_PKG_BUILD_IN_SRC-false}; then + echo "Building in src due to TERMUX_PKG_BUILD_IN_SRC being set to true" > "$TERMUX_PKG_BUILDDIR/BUILDING_IN_SRC.txt" TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR fi diff --git a/scripts/buildorder.py b/scripts/buildorder.py index 0a7b4224b7..5226840247 100755 --- a/scripts/buildorder.py +++ b/scripts/buildorder.py @@ -63,7 +63,7 @@ class TermuxPackage(object): self.deps = parse_build_file_dependencies(build_sh_path) - if os.getenv('TERMUX_ON_DEVICE_BUILD') is None: + if os.getenv('TERMUX_ON_DEVICE_BUILD') == "true": always_deps = ['libc++'] for dependency_name in always_deps: if dependency_name not in self.deps and self.name not in always_deps: