From 1d96dec9c1a1673224835767ea773ccbc7be40b1 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Tue, 23 Apr 2024 18:37:30 +0000 Subject: [PATCH] chore(linter compliance): miscellaneous [no ci] --- packages/alist/build.sh | 4 +- packages/apt-file/build.sh | 2 +- packages/aspell-de/build.sh | 2 +- packages/aspell-en/build.sh | 6 +- packages/aspell-es/build.sh | 6 +- packages/aspell-fr/build.sh | 2 +- packages/bc/build.sh | 2 +- packages/beanshell/build.sh | 2 +- packages/binutils-libs/build.sh | 2 +- packages/bionic-host/build.sh | 102 ++++++++++++------------- packages/cbonsai/build.sh | 4 +- packages/cronie/build.sh | 16 ++-- packages/debootstrap/build.sh | 2 +- packages/distant/build.sh | 2 +- packages/dmagnetic/build.sh | 4 +- packages/dx/build.sh | 2 +- packages/enchant/build.sh | 2 +- packages/faust/build.sh | 6 +- packages/ffmpeg/build.sh | 2 +- packages/flang/build.sh | 4 +- packages/git/build.sh | 4 +- packages/gnunet/build.sh | 2 +- packages/gnuplot/build.sh | 2 +- packages/groovy/build.sh | 2 +- packages/hunspell-en-us/build.sh | 2 +- packages/hunspell-fr/build.sh | 8 +- packages/kibi/build.sh | 4 +- packages/ldc/build.sh | 20 ++--- packages/llvm-mingw-w64-tools/build.sh | 2 +- packages/lrzsz/build.sh | 2 +- packages/manpages/build.sh | 6 +- packages/ncurses/build.sh | 24 +++--- packages/ndk-multilib/build.sh | 2 +- packages/npush/build.sh | 2 +- packages/opencolorio/build.sh | 8 +- packages/perl/build.sh | 6 +- packages/proxmark3/build.sh | 20 ++--- packages/pypy/build.sh | 6 +- packages/pypy3/build.sh | 6 +- packages/python/build.sh | 10 +-- packages/python2/build.sh | 6 +- packages/ruff/build.sh | 2 +- packages/suite3270/build.sh | 2 +- packages/swift/build.sh | 2 +- packages/tar/build.sh | 6 +- packages/termux-am/build.sh | 2 +- packages/termux-gui-pm/build.sh | 2 +- packages/texlive-bin/build.sh | 2 +- packages/texlive-installer/build.sh | 16 ++-- packages/unar/build.sh | 2 +- packages/usql/build.sh | 2 +- 51 files changed, 178 insertions(+), 178 deletions(-) diff --git a/packages/alist/build.sh b/packages/alist/build.sh index 1223e23d6c..0592f0ccb9 100644 --- a/packages/alist/build.sh +++ b/packages/alist/build.sh @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="2096779623 " TERMUX_PKG_VERSION=(3.33.0) # alist version TERMUX_PKG_VERSION+=(3.33.0) # alist-web version TERMUX_PKG_SRCURL=(https://github.com/alist-org/alist/archive/v${TERMUX_PKG_VERSION}.tar.gz - https://github.com/alist-org/alist-web/releases/download/${TERMUX_PKG_VERSION[1]}/dist.tar.gz) + https://github.com/alist-org/alist-web/releases/download/${TERMUX_PKG_VERSION[1]}/dist.tar.gz) TERMUX_PKG_SHA256=(28aea1ddae1f394b9d66ca95cf25ab86cf30cce94544783ce7ea440f15d95f77 - 50ae0539720bce7c470ac6bc47216b0e103e73636ee3a9b4b9364e2b52ca93f6) + 50ae0539720bce7c470ac6bc47216b0e103e73636ee3a9b4b9364e2b52ca93f6) TERMUX_PKG_BUILD_IN_SRC=true # termux_pkg_upgrade_version couldn't check multiple versions now. TERMUX_PKG_AUTO_UPDATE=false diff --git a/packages/apt-file/build.sh b/packages/apt-file/build.sh index cdf7aa5290..b7baac0dcf 100644 --- a/packages/apt-file/build.sh +++ b/packages/apt-file/build.sh @@ -16,5 +16,5 @@ TERMUX_PKG_EXTRA_MAKE_ARGS="DESTDIR=$TERMUX_PREFIX BINDIR=$TERMUX_PREFIX/bin \ termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/etc/bash_completion.d/ cp $TERMUX_PKG_SRCDIR/debian/bash-completion \ - $TERMUX_PREFIX/etc/bash_completion.d/apt-file + $TERMUX_PREFIX/etc/bash_completion.d/apt-file } diff --git a/packages/aspell-de/build.sh b/packages/aspell-de/build.sh index 4686102c7d..8cfc098fe4 100644 --- a/packages/aspell-de/build.sh +++ b/packages/aspell-de/build.sh @@ -21,6 +21,6 @@ termux_step_make() { } termux_step_make_install() { - make install + make install echo "add de_CH.multi" > "${TERMUX_PREFIX}/lib/aspell-0.60/swiss.alias" } diff --git a/packages/aspell-en/build.sh b/packages/aspell-en/build.sh index 6c756ff1ed..c196a6ec8c 100644 --- a/packages/aspell-en/build.sh +++ b/packages/aspell-en/build.sh @@ -12,9 +12,9 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_configure() { cat > $TERMUX_PKG_SRCDIR/Makefile <<- EOF - ASPELL = `command -v aspell` - ASPELL_FLAGS = - PREZIP = `command -v prezip` + ASPELL = $(command -v aspell) + ASPELL_FLAGS = + PREZIP = $(command -v prezip) DESTDIR = dictdir = $TERMUX_PREFIX/lib/aspell-0.60 datadir = $TERMUX_PREFIX/lib/aspell-0.60 diff --git a/packages/aspell-es/build.sh b/packages/aspell-es/build.sh index 70fc41fc2c..b954ddc0fc 100644 --- a/packages/aspell-es/build.sh +++ b/packages/aspell-es/build.sh @@ -12,9 +12,9 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_configure() { cat > $TERMUX_PKG_SRCDIR/Makefile <<- EOF - ASPELL = `command -v aspell` - ASPELL_FLAGS = - PREZIP = `command -v prezip` + ASPELL = $(command -v aspell) + ASPELL_FLAGS = + PREZIP = $(command -v prezip) DESTDIR = dictdir = $TERMUX_PREFIX/lib/aspell-0.60 datadir = $TERMUX_PREFIX/lib/aspell-0.60 diff --git a/packages/aspell-fr/build.sh b/packages/aspell-fr/build.sh index 152d08af8e..83fd45a120 100644 --- a/packages/aspell-fr/build.sh +++ b/packages/aspell-fr/build.sh @@ -13,7 +13,7 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_configure() { cat > $TERMUX_PKG_SRCDIR/Makefile <<- EOF ASPELL = $(command -v aspell) - ASPELL_FLAGS = + ASPELL_FLAGS = WORD_LIST_COMPRESS = $(command -v word-list-compress) DESTDIR = dictdir = $TERMUX_PREFIX/lib/aspell-0.60 diff --git a/packages/bc/build.sh b/packages/bc/build.sh index 35a46e7c85..a28d1843dd 100644 --- a/packages/bc/build.sh +++ b/packages/bc/build.sh @@ -16,6 +16,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" termux_step_pre_configure() { cp $TERMUX_PKG_HOSTBUILD_DIR/bc/libmath.h \ - $TERMUX_PKG_SRCDIR/bc/libmath.h + $TERMUX_PKG_SRCDIR/bc/libmath.h touch -d "next hour" $TERMUX_PKG_SRCDIR/bc/libmath.h } diff --git a/packages/beanshell/build.sh b/packages/beanshell/build.sh index c914be1a29..5316644a26 100644 --- a/packages/beanshell/build.sh +++ b/packages/beanshell/build.sh @@ -39,7 +39,7 @@ termux_step_make_install() { termux_step_create_debscripts() { cat <<- EOF > ./postinst #!${TERMUX_PREFIX}/bin/bash - chmod -w $TERMUX_PREFIX/share/dex/beanshell.jar + chmod -w $TERMUX_PREFIX/share/dex/beanshell.jar rm -f $TERMUX_PREFIX/share/dex/oat/*/beanshell.{art,oat,odex,vdex} >/dev/null 2>&1 exit 0 EOF diff --git a/packages/binutils-libs/build.sh b/packages/binutils-libs/build.sh index dbf8c991fa..824a000704 100644 --- a/packages/binutils-libs/build.sh +++ b/packages/binutils-libs/build.sh @@ -53,7 +53,7 @@ termux_step_pre_configure() { # others, including the rust toolchain) to fail like so: # # ld.lld: error: version script assignment of 'LIBCTF_1.0' to symbol 'ctf_label_set' failed: symbol not defined - # ld.lld: error: version script assignment of 'LIBCTF_1.0' to symbol 'ctf_label_get' failed: symbol not defined + # ld.lld: error: version script assignment of 'LIBCTF_1.0' to symbol 'ctf_label_get' failed: symbol not defined # These flags restore it to a warning. # https://reviews.llvm.org/D135402 export LDFLAGS="$LDFLAGS -Wl,--undefined-version" diff --git a/packages/bionic-host/build.sh b/packages/bionic-host/build.sh index 3c25d4e3ab..6f764019b5 100644 --- a/packages/bionic-host/build.sh +++ b/packages/bionic-host/build.sh @@ -10,71 +10,71 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_SKIP_SRC_EXTRACT=true termux_step_get_source() { - if $TERMUX_ON_DEVICE_BUILD; then - termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." - fi - - case "${TERMUX_ARCH}" in - i686) _ARCH=x86 ;; - aarch64) _ARCH=arm64 ;; - *) _ARCH=${TERMUX_ARCH} ;; - esac + if $TERMUX_ON_DEVICE_BUILD; then + termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." + fi - export LD_LIBRARY_PATH="${TERMUX_PKG_SRCDIR}/prefix/lib/x86_64-linux-gnu:${TERMUX_PKG_SRCDIR}/prefix/usr/lib/x86_64-linux-gnu" - export PATH="$(sed "s#/home/`whoami`/.cargo/bin:##" <<< $PATH):${TERMUX_PKG_SRCDIR}/prefix/usr/bin:$PATH" + case "${TERMUX_ARCH}" in + i686) _ARCH=x86 ;; + aarch64) _ARCH=arm64 ;; + *) _ARCH=${TERMUX_ARCH} ;; + esac - mkdir -p ${TERMUX_PKG_SRCDIR}/prefix - cd ${TERMUX_PKG_SRCDIR} + export LD_LIBRARY_PATH="${TERMUX_PKG_SRCDIR}/prefix/lib/x86_64-linux-gnu:${TERMUX_PKG_SRCDIR}/prefix/usr/lib/x86_64-linux-gnu" + export PATH="$(sed "s#/home/`whoami`/.cargo/bin:##" <<< $PATH):${TERMUX_PKG_SRCDIR}/prefix/usr/bin:$PATH" - cp -f ${TERMUX_PKG_BUILDER_DIR}/LICENSE.txt ${TERMUX_PKG_SRCDIR}/LICENSE.txt + mkdir -p ${TERMUX_PKG_SRCDIR}/prefix + cd ${TERMUX_PKG_SRCDIR} - local PACKAGES=( - "http://security.ubuntu.com/ubuntu/pool/universe/n/ncurses/libtinfo5_6.4-2ubuntu0.1_amd64.deb a5acc48e56ca4cd1b2e5fb22b36c5a02788c0baede55617e3f30decff58616ab" - "http://security.ubuntu.com/ubuntu/pool/universe/n/ncurses/libncurses5_6.4-2ubuntu0.1_amd64.deb 654b4f5b41380efabf606a691174974f9304e0b3ee461d0d91712b7e024f5546" - "http://mirrors.kernel.org/ubuntu/pool/main/o/openssh/openssh-client_8.9p1-3ubuntu0.4_amd64.deb afb16d53e762a78fabd9ce405752cd35d2f45904355ee820ce00f67bdf530155" - ) - for item in "${PACKAGES[@]}"; do - local URL=$(cut -d' ' -f1 <<< $item) SHA256=$(cut -d' ' -f2 <<< $item) - termux_download ${URL} ${TERMUX_PKG_CACHEDIR}/${URL##*/} ${SHA256} + cp -f ${TERMUX_PKG_BUILDER_DIR}/LICENSE.txt ${TERMUX_PKG_SRCDIR}/LICENSE.txt - mkdir -p ${TERMUX_PKG_TMPDIR}/${URL##*/} - ar x ${TERMUX_PKG_CACHEDIR}/${URL##*/} --output=${TERMUX_PKG_TMPDIR}/${URL##*/} - tar xf ${TERMUX_PKG_TMPDIR}/${URL##*/}/data.tar.zst -C ${TERMUX_PKG_SRCDIR}/prefix - done + local PACKAGES=( + "http://security.ubuntu.com/ubuntu/pool/universe/n/ncurses/libtinfo5_6.4-2ubuntu0.1_amd64.deb a5acc48e56ca4cd1b2e5fb22b36c5a02788c0baede55617e3f30decff58616ab" + "http://security.ubuntu.com/ubuntu/pool/universe/n/ncurses/libncurses5_6.4-2ubuntu0.1_amd64.deb 654b4f5b41380efabf606a691174974f9304e0b3ee461d0d91712b7e024f5546" + "http://mirrors.kernel.org/ubuntu/pool/main/o/openssh/openssh-client_8.9p1-3ubuntu0.4_amd64.deb afb16d53e762a78fabd9ce405752cd35d2f45904355ee820ce00f67bdf530155" + ) + for item in "${PACKAGES[@]}"; do + local URL=$(cut -d' ' -f1 <<< $item) SHA256=$(cut -d' ' -f2 <<< $item) + termux_download ${URL} ${TERMUX_PKG_CACHEDIR}/${URL##*/} ${SHA256} - termux_download \ - https://storage.googleapis.com/git-repo-downloads/repo \ - ${TERMUX_PKG_CACHEDIR}/repo \ - df6e4f72ef21d839b4352f376ab9428e303a1414ac7a1f21fe420069b2acd476 - chmod +x ${TERMUX_PKG_CACHEDIR}/repo - ${TERMUX_PKG_CACHEDIR}/repo init \ - -u https://android.googlesource.com/platform/manifest \ - -b main -m ${TERMUX_PKG_BUILDER_DIR}/default.xml - ${TERMUX_PKG_CACHEDIR}/repo sync -c -j32 + mkdir -p ${TERMUX_PKG_TMPDIR}/${URL##*/} + ar x ${TERMUX_PKG_CACHEDIR}/${URL##*/} --output=${TERMUX_PKG_TMPDIR}/${URL##*/} + tar xf ${TERMUX_PKG_TMPDIR}/${URL##*/}/data.tar.zst -C ${TERMUX_PKG_SRCDIR}/prefix + done - sed -i '1s|.*|\#!'${TERMUX_PKG_SRCDIR}'/prebuilts/python/linux-x86/2.7.5/bin/python2|' ${TERMUX_PKG_SRCDIR}/bionic/libc/fs_config_generator.py - sed -i '1s|.*|\#!'${TERMUX_PKG_SRCDIR}'/prebuilts/python/linux-x86/2.7.5/bin/python2|' ${TERMUX_PKG_SRCDIR}/external/clang/clang-version-inc.py - sed -i '/selinux/d' ${TERMUX_PKG_SRCDIR}/system/core/debuggerd/Android.bp - sed -i '/selinux/d' ${TERMUX_PKG_SRCDIR}/system/core/debuggerd/crash_dump.cpp - sed -i '/selinux/d' ${TERMUX_PKG_SRCDIR}/system/core/debuggerd/debuggerd.cpp + termux_download \ + https://storage.googleapis.com/git-repo-downloads/repo \ + ${TERMUX_PKG_CACHEDIR}/repo \ + df6e4f72ef21d839b4352f376ab9428e303a1414ac7a1f21fe420069b2acd476 + chmod +x ${TERMUX_PKG_CACHEDIR}/repo + ${TERMUX_PKG_CACHEDIR}/repo init \ + -u https://android.googlesource.com/platform/manifest \ + -b main -m ${TERMUX_PKG_BUILDER_DIR}/default.xml + ${TERMUX_PKG_CACHEDIR}/repo sync -c -j32 + + sed -i '1s|.*|\#!'${TERMUX_PKG_SRCDIR}'/prebuilts/python/linux-x86/2.7.5/bin/python2|' ${TERMUX_PKG_SRCDIR}/bionic/libc/fs_config_generator.py + sed -i '1s|.*|\#!'${TERMUX_PKG_SRCDIR}'/prebuilts/python/linux-x86/2.7.5/bin/python2|' ${TERMUX_PKG_SRCDIR}/external/clang/clang-version-inc.py + sed -i '/selinux/d' ${TERMUX_PKG_SRCDIR}/system/core/debuggerd/Android.bp + sed -i '/selinux/d' ${TERMUX_PKG_SRCDIR}/system/core/debuggerd/crash_dump.cpp + sed -i '/selinux/d' ${TERMUX_PKG_SRCDIR}/system/core/debuggerd/debuggerd.cpp } termux_step_configure() { - : + : } termux_step_make() { - env -i LD_LIBRARY_PATH=$LD_LIBRARY_PATH PATH=$PATH bash -c " - set -e; - cd ${TERMUX_PKG_SRCDIR} - source build/envsetup.sh; - lunch aosp_${_ARCH}-eng; - make JAVA_NOT_REQUIRED=true linker libc libm libdl libicuuc debuggerd crash_dump - " + env -i LD_LIBRARY_PATH=$LD_LIBRARY_PATH PATH=$PATH bash -c " + set -e; + cd ${TERMUX_PKG_SRCDIR} + source build/envsetup.sh; + lunch aosp_${_ARCH}-eng; + make JAVA_NOT_REQUIRED=true linker libc libm libdl libicuuc debuggerd crash_dump + " } termux_step_make_install() { - mkdir -p ${TERMUX_PREFIX}/opt/bionic-host/usr/icu - cp ${TERMUX_PKG_SRCDIR}/external/icu/icu4c/source/stubdata/icudt58l.dat ${TERMUX_PREFIX}/opt/bionic-host/usr/icu/ - cp -r ${TERMUX_PKG_SRCDIR}/out/target/product/generic*/system/* ${TERMUX_PREFIX}/opt/bionic-host/ + mkdir -p ${TERMUX_PREFIX}/opt/bionic-host/usr/icu + cp ${TERMUX_PKG_SRCDIR}/external/icu/icu4c/source/stubdata/icudt58l.dat ${TERMUX_PREFIX}/opt/bionic-host/usr/icu/ + cp -r ${TERMUX_PKG_SRCDIR}/out/target/product/generic*/system/* ${TERMUX_PREFIX}/opt/bionic-host/ } diff --git a/packages/cbonsai/build.sh b/packages/cbonsai/build.sh index e1f8d45704..cf9d7d9c87 100644 --- a/packages/cbonsai/build.sh +++ b/packages/cbonsai/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.com/jallbrit/cbonsai -TERMUX_PKG_DESCRIPTION="Grow bonsai trees in your terminal" +TERMUX_PKG_DESCRIPTION="Grow bonsai trees in your terminal" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_MAINTAINER="@termux" +TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.1 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://gitlab.com/jallbrit/cbonsai/-/archive/v${TERMUX_PKG_VERSION}/cbonsai-v${TERMUX_PKG_VERSION}.tar.gz diff --git a/packages/cronie/build.sh b/packages/cronie/build.sh index 3b1f6c936f..931c4c6bfe 100644 --- a/packages/cronie/build.sh +++ b/packages/cronie/build.sh @@ -22,14 +22,14 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_SERVICE_SCRIPT=("crond" 'exec crond -n -s') termux_step_post_get_source() { - sed -i "s|\"/usr/sbin/sendmail\"|\"${TERMUX_PREFIX}/bin/sendmail\"|" ${TERMUX_PKG_SRCDIR}/configure - sed -i "s|\"/usr/sbin/sendmail\"|\"${TERMUX_PREFIX}/bin/sendmail\"|" ${TERMUX_PKG_SRCDIR}/src/cron.c - sed -i "s|\"/tmp\"|\"${TERMUX_PREFIX}/tmp\"|" ${TERMUX_PKG_SRCDIR}/src/crontab.c - sed -i "s|_PATH_BSHELL \"/bin/sh\"|_PATH_BSHELL \"${TERMUX_PREFIX}/bin/sh\"|" ${TERMUX_PKG_SRCDIR}/src/crontab.c - sed -i "s|_PATH_STDPATH \"/usr/bin:/bin:/usr/sbin:/sbin\"|_PATH_STDPATH \"${TERMUX_PREFIX}/bin\"|" ${TERMUX_PKG_SRCDIR}/src/crontab.c - sed -i "s|_PATH_TMP \"/tmp\"|_PATH_TMP \"${TERMUX_PREFIX}/tmp\"|" ${TERMUX_PKG_SRCDIR}/src/crontab.c - sed -i "s|getdtablesize()|sysconf(_SC_OPEN_MAX)|" ${TERMUX_PKG_SRCDIR}/src/do_command.c - sed -i "s|getdtablesize()|sysconf(_SC_OPEN_MAX)|" ${TERMUX_PKG_SRCDIR}/src/popen.c + sed -i "s|\"/usr/sbin/sendmail\"|\"${TERMUX_PREFIX}/bin/sendmail\"|" ${TERMUX_PKG_SRCDIR}/configure + sed -i "s|\"/usr/sbin/sendmail\"|\"${TERMUX_PREFIX}/bin/sendmail\"|" ${TERMUX_PKG_SRCDIR}/src/cron.c + sed -i "s|\"/tmp\"|\"${TERMUX_PREFIX}/tmp\"|" ${TERMUX_PKG_SRCDIR}/src/crontab.c + sed -i "s|_PATH_BSHELL \"/bin/sh\"|_PATH_BSHELL \"${TERMUX_PREFIX}/bin/sh\"|" ${TERMUX_PKG_SRCDIR}/src/crontab.c + sed -i "s|_PATH_STDPATH \"/usr/bin:/bin:/usr/sbin:/sbin\"|_PATH_STDPATH \"${TERMUX_PREFIX}/bin\"|" ${TERMUX_PKG_SRCDIR}/src/crontab.c + sed -i "s|_PATH_TMP \"/tmp\"|_PATH_TMP \"${TERMUX_PREFIX}/tmp\"|" ${TERMUX_PKG_SRCDIR}/src/crontab.c + sed -i "s|getdtablesize()|sysconf(_SC_OPEN_MAX)|" ${TERMUX_PKG_SRCDIR}/src/do_command.c + sed -i "s|getdtablesize()|sysconf(_SC_OPEN_MAX)|" ${TERMUX_PKG_SRCDIR}/src/popen.c } termux_step_create_debscripts() { diff --git a/packages/debootstrap/build.sh b/packages/debootstrap/build.sh index 87c3d0830d..8784c13c0f 100644 --- a/packages/debootstrap/build.sh +++ b/packages/debootstrap/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make() { - : + : } termux_step_make_install() { diff --git a/packages/distant/build.sh b/packages/distant/build.sh index 305e3c0123..b81569de73 100644 --- a/packages/distant/build.sh +++ b/packages/distant/build.sh @@ -16,7 +16,7 @@ termux_step_pre_configure() { export LIBSSH2_SYS_USE_PKG_CONFIG=1 export PKG_CONFIG_ALLOW_CROSS=1 - sed -i "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" ${TERMUX_PKG_SRCDIR}/src/constants.rs + sed -i "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" ${TERMUX_PKG_SRCDIR}/src/constants.rs termux_setup_rust : "${CARGO_HOME:=$HOME/.cargo}" diff --git a/packages/dmagnetic/build.sh b/packages/dmagnetic/build.sh index d4937578b6..4625e436af 100644 --- a/packages/dmagnetic/build.sh +++ b/packages/dmagnetic/build.sh @@ -23,7 +23,7 @@ termux_step_post_configure() { termux_step_post_make_install() { sed "s%@TERMUX_PREFIX@%$TERMUX_PREFIX%g" \ - $TERMUX_PKG_BUILDER_DIR/magnetic-scrolls.in \ - > $TERMUX_PREFIX/bin/magnetic-scrolls + $TERMUX_PKG_BUILDER_DIR/magnetic-scrolls.in \ + > $TERMUX_PREFIX/bin/magnetic-scrolls chmod 700 $TERMUX_PREFIX/bin/magnetic-scrolls } diff --git a/packages/dx/build.sh b/packages/dx/build.sh index e650908176..6fcb904413 100644 --- a/packages/dx/build.sh +++ b/packages/dx/build.sh @@ -43,7 +43,7 @@ termux_step_create_debscripts() { cat <<- EOF > ./postinst #!${TERMUX_PREFIX}/bin/bash rm -f $TERMUX_PREFIX/share/dex/oat/*/dx.{art,oat,odex,vdex} >/dev/null 2>&1 - chmod -w $TERMUX_PREFIX/share/dex/dx.jar + chmod -w $TERMUX_PREFIX/share/dex/dx.jar exit 0 EOF } diff --git a/packages/enchant/build.sh b/packages/enchant/build.sh index 4b52081167..aa026f764e 100644 --- a/packages/enchant/build.sh +++ b/packages/enchant/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION="2.7.0" TERMUX_PKG_SRCURL=https://github.com/AbiWord/enchant/releases/download/v${TERMUX_PKG_VERSION}/enchant-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=2a073dc6ebe753196c0674a781ccf321bed25d1c6e43bffb97e2c92af420952c TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-relocatable" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-relocatable" TERMUX_PKG_DEPENDS="aspell, glib, hunspell, libc++" termux_step_pre_configure() { diff --git a/packages/faust/build.sh b/packages/faust/build.sh index 966e8b65fa..6dacf7e661 100644 --- a/packages/faust/build.sh +++ b/packages/faust/build.sh @@ -78,18 +78,18 @@ termux_step_post_make_install() { # in one go since $TERMUX_PREFIX also contain "/usr" so we risk doubling the prefix: # "/data/data/com.termux/files/data/data/com.termux/files/usr" - sed -i "s@$TERMUX_PREFIX@\$TERMUX_PREFIX@g" $faustscripts + sed -i "s@$TERMUX_PREFIX@\$TERMUX_PREFIX@g" $faustscripts sed -i "s@/usr/local@\$TERMUX_PREFIX@g" $faustscripts sed -i "s@/usr@\$TERMUX_PREFIX@g" $faustscripts - # turns /tmp and /var with $TERMUX_PREFIX_{tmp,var} + # turns /tmp and /var with $TERMUX_PREFIX_{tmp,var} for i in tmp var; do sed -i "s@\$TERMUX_PREFIX/${i}/@\$TERMUX_PREFIX_${i}@g" $faustscripts perl -pi -e 's@(?<=("|[^[:alnum:]_\.]))/'${i}'(?=(/|\s))@\$TERMUX_PREFIX_'${i}'@g' \ $faustscripts done - # restore + # restore for i in tmp var; do sed -i "s@\$TERMUX_PREFIX_${i}@\$TERMUX_PREFIX/${i}@g" $faustscripts done diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh index ebebfd0006..86ea8a2450 100644 --- a/packages/ffmpeg/build.sh +++ b/packages/ffmpeg/build.sh @@ -81,7 +81,7 @@ termux_step_configure() { --enable-libmp3lame \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ - --enable-libopenmpt \ + --enable-libopenmpt \ --enable-libopus \ --enable-librav1e \ --enable-libsoxr \ diff --git a/packages/flang/build.sh b/packages/flang/build.sh index 4b57418a28..19d1fd8fe1 100644 --- a/packages/flang/build.sh +++ b/packages/flang/build.sh @@ -53,8 +53,8 @@ termux_step_host_build() { termux_setup_ninja cmake -G Ninja "-DCMAKE_BUILD_TYPE=Release" \ - "-DLLVM_ENABLE_PROJECTS=clang;mlir" \ - $TERMUX_PKG_SRCDIR/llvm + "-DLLVM_ENABLE_PROJECTS=clang;mlir" \ + $TERMUX_PKG_SRCDIR/llvm ninja -j $TERMUX_MAKE_PROCESSES clang-tblgen mlir-tblgen } diff --git a/packages/git/build.sh b/packages/git/build.sh index fca9e4a112..9b4210fb00 100644 --- a/packages/git/build.sh +++ b/packages/git/build.sh @@ -74,8 +74,8 @@ termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/etc/bash_completion.d/ cp $TERMUX_PKG_SRCDIR/contrib/completion/git-completion.bash \ - $TERMUX_PKG_SRCDIR/contrib/completion/git-prompt.sh \ - $TERMUX_PREFIX/etc/bash_completion.d/ + $TERMUX_PKG_SRCDIR/contrib/completion/git-prompt.sh \ + $TERMUX_PREFIX/etc/bash_completion.d/ # Remove the build machine perl setup in termux_step_pre_configure to avoid it being packaged: rm $TERMUX_PREFIX/bin/perl diff --git a/packages/gnunet/build.sh b/packages/gnunet/build.sh index 4a38f055d1..8dff98d4f8 100644 --- a/packages/gnunet/build.sh +++ b/packages/gnunet/build.sh @@ -23,7 +23,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_have_decl_struct_in6_ifreq=yes" # Submodule path 'contrib/gana': checked out '79163ab6ea6f6cfe7f4311f91fb45c747b8c33da' # error: Server does not allow request for unadvertised object 4f40b5deca02c8dc64ff6c73e6602e6abdd1bae2 # fatal: Fetched in submodule path 'contrib/sphinx', but it did not contain 4f40b5deca02c8dc64ff6c73e6602e6abdd1bae2. Direct fetching of that commit failed. -# fatal: +# fatal: # ##[error]Process completed with exit code 128. # ``` termux_step_get_source() { diff --git a/packages/gnuplot/build.sh b/packages/gnuplot/build.sh index 544aa7dab6..b1f65030dc 100644 --- a/packages/gnuplot/build.sh +++ b/packages/gnuplot/build.sh @@ -36,5 +36,5 @@ termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/share/gnuplot/${TERMUX_PKG_VERSION:0:3}/ cp $TERMUX_PKG_HOSTBUILD_DIR/docs/gnuplot.gih \ - $TERMUX_PREFIX/share/gnuplot/${TERMUX_PKG_VERSION:0:3}/gnuplot.gih + $TERMUX_PREFIX/share/gnuplot/${TERMUX_PKG_VERSION:0:3}/gnuplot.gih } diff --git a/packages/groovy/build.sh b/packages/groovy/build.sh index 9873bf2075..fe3f468808 100644 --- a/packages/groovy/build.sh +++ b/packages/groovy/build.sh @@ -53,7 +53,7 @@ termux_step_make_install() { rm -rf $TERMUX_PREFIX/opt/groovy mkdir -p $TERMUX_PREFIX/opt/groovy find . -mindepth 1 -maxdepth 1 ! -name jansi ! -name jline2 \ - -exec cp -r \{\} $TERMUX_PREFIX/opt/groovy/ \; + -exec cp -r \{\} $TERMUX_PREFIX/opt/groovy/ \; for i in $TERMUX_PREFIX/opt/groovy/bin/*; do if [ ! -f "$i" ]; then continue diff --git a/packages/hunspell-en-us/build.sh b/packages/hunspell-en-us/build.sh index e547d975b4..15980d5e2d 100644 --- a/packages/hunspell-en-us/build.sh +++ b/packages/hunspell-en-us/build.sh @@ -18,6 +18,6 @@ termux_step_make_install() { c7a8c4d08c29d237880844b1623099f59092602f189be38ce3912e457ff38bc1 termux_download https://cgit.freedesktop.org/libreoffice/dictionaries/plain/en/en_US.dic \ $TERMUX_PREFIX/share/hunspell/en_US.dic \ - f0b1a234bd178bdd01875b2a392a9647f888b8fe879f79c52aae62c2759b3647 + f0b1a234bd178bdd01875b2a392a9647f888b8fe879f79c52aae62c2759b3647 touch $TERMUX_PREFIX/share/hunspell/en_US.{aff,dic} } diff --git a/packages/hunspell-fr/build.sh b/packages/hunspell-fr/build.sh index 2024bd1d16..26c6577b41 100644 --- a/packages/hunspell-fr/build.sh +++ b/packages/hunspell-fr/build.sh @@ -14,10 +14,10 @@ termux_step_make_install() { # https://cgit.freedesktop.org/libreoffice/dictionaries/log/fr_FR/fr.dic # In which case we need to bump version and checksum used. termux_download https://cgit.freedesktop.org/libreoffice/dictionaries/plain/fr_FR/fr.aff \ - $TERMUX_PREFIX/share/hunspell/fr_FR.aff \ - 4730775ff4488c4a9aa4833393c8b2187126336eed766866300a58a75fe874f0 + $TERMUX_PREFIX/share/hunspell/fr_FR.aff \ + 4730775ff4488c4a9aa4833393c8b2187126336eed766866300a58a75fe874f0 termux_download https://cgit.freedesktop.org/libreoffice/dictionaries/plain/fr_FR/fr.dic \ - $TERMUX_PREFIX/share/hunspell/fr_FR.dic \ - b99447ab2e655c1e4b64509cfd2e6c24821242bff1f971b49eac723e388a2d19 + $TERMUX_PREFIX/share/hunspell/fr_FR.dic \ + b99447ab2e655c1e4b64509cfd2e6c24821242bff1f971b49eac723e388a2d19 touch $TERMUX_PREFIX/share/hunspell/fr_FR.{aff,dic} } diff --git a/packages/kibi/build.sh b/packages/kibi/build.sh index 926d0d88d5..b49425c6c7 100644 --- a/packages/kibi/build.sh +++ b/packages/kibi/build.sh @@ -9,6 +9,6 @@ TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_make_install() { - install -Dm644 "config_example.ini" "$TERMUX_PREFIX/etc/kibi/config.ini" - install -Dm644 syntax.d/* -t "$TERMUX_PREFIX/share/kibi/syntax.d" + install -Dm644 "config_example.ini" "$TERMUX_PREFIX/etc/kibi/config.ini" + install -Dm644 syntax.d/* -t "$TERMUX_PREFIX/share/kibi/syntax.d" } diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index 65ba509457..4672b47cf5 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -8,17 +8,17 @@ TERMUX_PKG_VERSION+=(2.100.1) # TOOLS version TERMUX_PKG_VERSION+=(1.30.0) # DUB version TERMUX_PKG_SRCURL=(https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc-${TERMUX_PKG_VERSION}-src.tar.gz - https://github.com/ldc-developers/llvm-project/releases/download/ldc-v${TERMUX_PKG_VERSION[1]}/llvm-${TERMUX_PKG_VERSION[1]}.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-${TERMUX_PKG_VERSION[1]}/libunwind-${TERMUX_PKG_VERSION[1]}.src.tar.xz - https://github.com/dlang/tools/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz - https://github.com/dlang/dub/archive/v${TERMUX_PKG_VERSION[3]}.tar.gz - https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc2-${TERMUX_PKG_VERSION}-linux-x86_64.tar.xz) + https://github.com/ldc-developers/llvm-project/releases/download/ldc-v${TERMUX_PKG_VERSION[1]}/llvm-${TERMUX_PKG_VERSION[1]}.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-${TERMUX_PKG_VERSION[1]}/libunwind-${TERMUX_PKG_VERSION[1]}.src.tar.xz + https://github.com/dlang/tools/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz + https://github.com/dlang/dub/archive/v${TERMUX_PKG_VERSION[3]}.tar.gz + https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc2-${TERMUX_PKG_VERSION}-linux-x86_64.tar.xz) TERMUX_PKG_SHA256=(fdbb376f08242d917922a6a22a773980217fafa310046fc5d6459490af23dacd - 9638d8d0b6a43d9cdc53699bec19e6bc9bef98f5950b99e6b8c1ec373aee4fa7 - 301137841d1e3401f59b3828d2a9ac86a1b826b89265d55541a2fd6ca2a595eb - 54bde9a979d70952690a517f90de8d76631fa9a2f7252af7278dafbcaaa42d54 - 840cd65bf5f0dd06ca688f63b94d71fccd92b526bbf1d3892fe5535b1e85c10e - 5784d4cc47d0845af0897d3b7473a08dd0281a4cdabac0a486740840d014fde1) + 9638d8d0b6a43d9cdc53699bec19e6bc9bef98f5950b99e6b8c1ec373aee4fa7 + 301137841d1e3401f59b3828d2a9ac86a1b826b89265d55541a2fd6ca2a595eb + 54bde9a979d70952690a517f90de8d76631fa9a2f7252af7278dafbcaaa42d54 + 840cd65bf5f0dd06ca688f63b94d71fccd92b526bbf1d3892fe5535b1e85c10e + 5784d4cc47d0845af0897d3b7473a08dd0281a4cdabac0a486740840d014fde1) TERMUX_PKG_AUTO_UPDATE=false # dub dlopen()s libcurl.so: TERMUX_PKG_DEPENDS="binutils-bin, binutils-is-llvm | binutils, clang, libc++, libcurl, zlib" diff --git a/packages/llvm-mingw-w64-tools/build.sh b/packages/llvm-mingw-w64-tools/build.sh index 16ce950b01..db2a6e3fdb 100644 --- a/packages/llvm-mingw-w64-tools/build.sh +++ b/packages/llvm-mingw-w64-tools/build.sh @@ -34,7 +34,7 @@ termux_step_make() { ../configure --host=$TERMUX_HOST_PLATFORM \ --prefix="$_INSTALL_PREFIX" \ --target=x86_64-w64-mingw32 \ - --with-widl-includedir="$_INCLUDE_DIR" + --with-widl-includedir="$_INCLUDE_DIR" make -j $TERMUX_MAKE_PROCESSES make install-strip mkdir -p "$_INSTALL_PREFIX/share/widl" diff --git a/packages/lrzsz/build.sh b/packages/lrzsz/build.sh index 59bd24e172..6a049a7b37 100644 --- a/packages/lrzsz/build.sh +++ b/packages/lrzsz/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=56f79c3eb8f6b140693667802d516824c2e115a83d15e1b4d5adbe1deab7c2 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_METHOD=repology TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ---disable-syslog +--disable-syslog --mandir=$TERMUX_PREFIX/share/man " diff --git a/packages/manpages/build.sh b/packages/manpages/build.sh index dee05b82b3..d6328375cb 100644 --- a/packages/manpages/build.sh +++ b/packages/manpages/build.sh @@ -4,11 +4,11 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSES/Linux-man-pages-copyleft.txt, _man-pages-posix/POSIX-COPYRIGHT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=(6.05.01 - 2017) + 2017) TERMUX_PKG_SHA256=(b96ab6b44a688c91d1b572e52fece519e1cfd2bb4c33fe7014fc3fd1ef3f9cae - ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3) + ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3) TERMUX_PKG_SRCURL=(https://www.kernel.org/pub/linux/docs/man-pages/man-pages-${TERMUX_PKG_VERSION}.tar.xz - https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-${TERMUX_PKG_VERSION[1]}-a.tar.xz) + https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-${TERMUX_PKG_VERSION[1]}-a.tar.xz) TERMUX_PKG_DEPENDS="man" TERMUX_PKG_CONFLICTS="linux-man-pages" TERMUX_PKG_REPLACES="linux-man-pages" diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh index d267af6462..5e6a78543a 100644 --- a/packages/ncurses/build.sh +++ b/packages/ncurses/build.sh @@ -10,21 +10,21 @@ TERMUX_PKG_MAINTAINER="@termux" # and uses github is a high available hosting. _SNAPSHOT_COMMIT=8bd5a3d98fc741bdcc9e5fada1a3d5980e1ea22a TERMUX_PKG_VERSION=(6.4.20231001 - 9.31 - 15 - 0.31.0 - 0.11.0) + 9.31 + 15 + 0.31.0 + 0.11.0) TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=(https://github.com/ThomasDickey/ncurses-snapshots/archive/${_SNAPSHOT_COMMIT}.tar.gz - https://fossies.org/linux/misc/rxvt-unicode-${TERMUX_PKG_VERSION[1]}.tar.bz2 - https://github.com/thestinger/termite/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz - https://github.com/kovidgoyal/kitty/releases/download/v${TERMUX_PKG_VERSION[3]}/kitty-${TERMUX_PKG_VERSION[3]}.tar.xz - https://github.com/alacritty/alacritty/archive/refs/tags/v${TERMUX_PKG_VERSION[4]}.tar.gz) + https://fossies.org/linux/misc/rxvt-unicode-${TERMUX_PKG_VERSION[1]}.tar.bz2 + https://github.com/thestinger/termite/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz + https://github.com/kovidgoyal/kitty/releases/download/v${TERMUX_PKG_VERSION[3]}/kitty-${TERMUX_PKG_VERSION[3]}.tar.xz + https://github.com/alacritty/alacritty/archive/refs/tags/v${TERMUX_PKG_VERSION[4]}.tar.gz) TERMUX_PKG_SHA256=(ca4a28ed4d38a7b79e1cd883e3d2755839072a7e4fe8cf265be1ef4ae79b6bc2 - aaa13fcbc149fe0f3f391f933279580f74a96fd312d6ed06b8ff03c2d46672e8 - 3ae9ebef28aad081c6c11351f086776e2fd9547563b2f900732b41c376bec05a - d122497134abab8e25dfcb6b127af40cfe641980e007f696732f70ed298198f5 - 0fb3370c662f5b87d1b9a487aef999195212b192e08f6f68a572fed8fd637e07) + aaa13fcbc149fe0f3f391f933279580f74a96fd312d6ed06b8ff03c2d46672e8 + 3ae9ebef28aad081c6c11351f086776e2fd9547563b2f900732b41c376bec05a + d122497134abab8e25dfcb6b127af40cfe641980e007f696732f70ed298198f5 + 0fb3370c662f5b87d1b9a487aef999195212b192e08f6f68a572fed8fd637e07) TERMUX_PKG_AUTO_UPDATE=false # ncurses-utils: tset/reset/clear are moved to package 'ncurses'. diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh index 63923c58cd..3c2956a05d 100644 --- a/packages/ndk-multilib/build.sh +++ b/packages/ndk-multilib/build.sh @@ -18,7 +18,7 @@ prepare_libs() { local NDK_SUFFIX=$SUFFIX if [ $ARCH = x86 ] || [ $ARCH = x86_64 ]; then - NDK_SUFFIX=$ARCH + NDK_SUFFIX=$ARCH fi mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib diff --git a/packages/npush/build.sh b/packages/npush/build.sh index f99ed120ea..3de21b467d 100644 --- a/packages/npush/build.sh +++ b/packages/npush/build.sh @@ -20,5 +20,5 @@ termux_step_make() { termux_step_make_install() { install -Dm755 -t $TERMUX_PREFIX/bin/ npush - install -Dm644 -t $TERMUX_PREFIX/share/npush/levels levels/* + install -Dm644 -t $TERMUX_PREFIX/share/npush/levels levels/* } diff --git a/packages/opencolorio/build.sh b/packages/opencolorio/build.sh index 23009033ef..02bb907c8d 100644 --- a/packages/opencolorio/build.sh +++ b/packages/opencolorio/build.sh @@ -15,8 +15,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DOCIO_BUILD_APPS=OFF" termux_step_pre_configure() { - # error: constant expression evaluates to -1 which cannot be narrowed to type 'char' [-Wc++11-narrowing] - # also same is used while building apt - CXXFLAGS+=" -Wno-c++11-narrowing" - CXXFLAGS+=" -I$PREFIX/include/pystring" + # error: constant expression evaluates to -1 which cannot be narrowed to type 'char' [-Wc++11-narrowing] + # also same is used while building apt + CXXFLAGS+=" -Wno-c++11-narrowing" + CXXFLAGS+=" -I$PREFIX/include/pystring" } diff --git a/packages/perl/build.sh b/packages/perl/build.sh index d74fbd5e2f..0dc686fe25 100644 --- a/packages/perl/build.sh +++ b/packages/perl/build.sh @@ -15,8 +15,8 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=(a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e a975c196075623f0dc94f57d00633b0d18ed08e3d85a3ea19d34ece4ec1a94c1) TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz - https://github.com/arsv/perl-cross/archive/${TERMUX_PKG_VERSION[1]}.tar.gz) -# https://github.com/arsv/perl-cross/releases/download/${TERMUX_PKG_VERSION[1]}/perl-cross-${TERMUX_PKG_VERSION[1]}.tar.gz) + https://github.com/arsv/perl-cross/archive/${TERMUX_PKG_VERSION[1]}.tar.gz) +# https://github.com/arsv/perl-cross/releases/download/${TERMUX_PKG_VERSION[1]}/perl-cross-${TERMUX_PKG_VERSION[1]}.tar.gz) TERMUX_PKG_DEPENDS=libandroid-utimes TERMUX_PKG_BUILD_IN_SRC=true TERMUX_MAKE_PROCESSES=1 @@ -68,7 +68,7 @@ termux_step_configure() { -Duseithreads \ -Dusemultiplicity \ -Doptimize="-O2" \ - --with-libs="-lm -L$TERMUX_PREFIX/lib -landroid-utimes" + --with-libs="-lm -L$TERMUX_PREFIX/lib -landroid-utimes" ) } diff --git a/packages/proxmark3/build.sh b/packages/proxmark3/build.sh index deb692c793..c3ec8af7e3 100644 --- a/packages/proxmark3/build.sh +++ b/packages/proxmark3/build.sh @@ -11,17 +11,17 @@ TERMUX_PKG_BUILD_IN_SRC="true" TERMUX_PKG_BLACKLISTED_ARCHES="i686, x86_64" termux_step_post_configure() { - export LDLIBS="-L${TERMUX_PREFIX}/lib" - export INCLUDES="-I${TERMUX_PREFIX}/include" - TERMUX_PKG_EXTRA_MAKE_ARGS="client CC=$CC CXX=$CXX LD=$CXX cpu_arch=$TERMUX_ARCH SKIPREVENGTEST=1 SKIPQT=1 SKIPPTHREAD=1 SKIPGD=1 PLATFORM=PM3GENERIC" + export LDLIBS="-L${TERMUX_PREFIX}/lib" + export INCLUDES="-I${TERMUX_PREFIX}/include" + TERMUX_PKG_EXTRA_MAKE_ARGS="client CC=$CC CXX=$CXX LD=$CXX cpu_arch=$TERMUX_ARCH SKIPREVENGTEST=1 SKIPQT=1 SKIPPTHREAD=1 SKIPGD=1 PLATFORM=PM3GENERIC" } termux_step_make_install() { - install -Dm700 "$TERMUX_PKG_BUILDDIR"/client/proxmark3 "$TERMUX_PREFIX"/bin/proxmark3 - mkdir -p "$TERMUX_PREFIX"/share/proxmark3/ - cp -R "$TERMUX_PKG_BUILDDIR"/client/resources/ "$TERMUX_PREFIX"/share/proxmark3/resources/ - cp -R "$TERMUX_PKG_BUILDDIR"/client/dictionaries/ "$TERMUX_PREFIX"/share/proxmark3/dictionaries/ - cp -R "$TERMUX_PKG_BUILDDIR"/client/pyscripts/ "$TERMUX_PREFIX"/share/proxmark3/pyscripts/ - cp -R "$TERMUX_PKG_BUILDDIR"/client/luascripts/ "$TERMUX_PREFIX"/share/proxmark3/luascripts/ - cp -R "$TERMUX_PKG_BUILDDIR"/client/lualibs/ "$TERMUX_PREFIX"/share/proxmark3/lualibs/ + install -Dm700 "$TERMUX_PKG_BUILDDIR"/client/proxmark3 "$TERMUX_PREFIX"/bin/proxmark3 + mkdir -p "$TERMUX_PREFIX"/share/proxmark3/ + cp -R "$TERMUX_PKG_BUILDDIR"/client/resources/ "$TERMUX_PREFIX"/share/proxmark3/resources/ + cp -R "$TERMUX_PKG_BUILDDIR"/client/dictionaries/ "$TERMUX_PREFIX"/share/proxmark3/dictionaries/ + cp -R "$TERMUX_PKG_BUILDDIR"/client/pyscripts/ "$TERMUX_PREFIX"/share/proxmark3/pyscripts/ + cp -R "$TERMUX_PKG_BUILDDIR"/client/luascripts/ "$TERMUX_PREFIX"/share/proxmark3/luascripts/ + cp -R "$TERMUX_PKG_BUILDDIR"/client/lualibs/ "$TERMUX_PREFIX"/share/proxmark3/lualibs/ } diff --git a/packages/pypy/build.sh b/packages/pypy/build.sh index 96c790d64e..ba8ac1827f 100644 --- a/packages/pypy/build.sh +++ b/packages/pypy/build.sh @@ -63,13 +63,13 @@ termux_step_pre_configure() { $_undocker_url \ $TERMUX_PKG_CACHEDIR/undocker.py \ $_undocker_checksums - + # Get proot termux_download \ $_proot_url \ $PROOT \ $_proot_checksums - + chmod +x $PROOT # Get qemu-aarch64-static @@ -154,7 +154,7 @@ termux_step_configure() { ln -s $TERMUX_PKG_SRCDIR $PYPY_SRC_DIR PROOT_HOST="env -i PROOT_NO_SECCOMP=1 $TERMUX_RUNTIME_ENV_VARS - $PROOT + $PROOT -b /proc -b /dev -b /sys -b $HOME -b $TERMUX_ANDROID_HOME diff --git a/packages/pypy3/build.sh b/packages/pypy3/build.sh index 6890b507e0..5d730587d4 100644 --- a/packages/pypy3/build.sh +++ b/packages/pypy3/build.sh @@ -67,13 +67,13 @@ termux_step_pre_configure() { $_undocker_url \ $TERMUX_PKG_CACHEDIR/undocker.py \ $_undocker_checksums - + # Get proot termux_download \ $_proot_url \ $PROOT \ $_proot_checksums - + chmod +x $PROOT # Get qemu-aarch64-static @@ -158,7 +158,7 @@ termux_step_configure() { ln -s $TERMUX_PKG_SRCDIR $PYPY_SRC_DIR PROOT_HOST="env -i PROOT_NO_SECCOMP=1 $TERMUX_RUNTIME_ENV_VARS - $PROOT + $PROOT -b /proc -b /dev -b /sys -b $HOME -b $TERMUX_ANDROID_HOME diff --git a/packages/python/build.sh b/packages/python/build.sh index 4d291148a4..f3ba342887 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -79,12 +79,12 @@ termux_step_pre_configure() { termux_step_post_make_install() { (cd $TERMUX_PREFIX/bin - ln -sf idle${_MAJOR_VERSION} idle - ln -sf python${_MAJOR_VERSION} python - ln -sf python${_MAJOR_VERSION}-config python-config - ln -sf pydoc${_MAJOR_VERSION} pydoc) + ln -sf idle${_MAJOR_VERSION} idle + ln -sf python${_MAJOR_VERSION} python + ln -sf python${_MAJOR_VERSION}-config python-config + ln -sf pydoc${_MAJOR_VERSION} pydoc) (cd $TERMUX_PREFIX/share/man/man1 - ln -sf python${_MAJOR_VERSION}.1 python.1) + ln -sf python${_MAJOR_VERSION}.1 python.1) } termux_step_post_massage() { diff --git a/packages/python2/build.sh b/packages/python2/build.sh index 511600f007..affe225ed2 100644 --- a/packages/python2/build.sh +++ b/packages/python2/build.sh @@ -74,9 +74,9 @@ termux_step_pre_configure() { termux_step_post_make_install() { # Avoid file clashes with the python (3) package: (cd $TERMUX_PREFIX/bin - mv 2to3 2to3-${_MAJOR_VERSION} - mv pydoc pydoc${_MAJOR_VERSION} - ln -sf pydoc${_MAJOR_VERSION} pydoc2) + mv 2to3 2to3-${_MAJOR_VERSION} + mv pydoc pydoc${_MAJOR_VERSION} + ln -sf pydoc${_MAJOR_VERSION} pydoc2) # Restore path which termux_step_host_build messed with export PATH=$TERMUX_ORIG_PATH } diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh index 991c554995..3255622f3a 100644 --- a/packages/ruff/build.sh +++ b/packages/ruff/build.sh @@ -18,7 +18,7 @@ termux_step_pre_configure() { mkdir -p _lib cd _lib $CC $CPPFLAGS $CFLAGS -fvisibility=hidden \ - -c $TERMUX_PKG_BUILDER_DIR/ctermid.c + -c $TERMUX_PKG_BUILDER_DIR/ctermid.c $AR cru libctermid.a ctermid.o RUSTFLAGS+=" -C link-arg=$TERMUX_PKG_BUILDDIR/_lib/libctermid.a" diff --git a/packages/suite3270/build.sh b/packages/suite3270/build.sh index 6205388cd8..7565afb715 100644 --- a/packages/suite3270/build.sh +++ b/packages/suite3270/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-windows --disable-x3270 ---disable-tcl3270 +--disable-tcl3270 ac_cv_path_LESSPATH=$TERMUX_PREFIX/bin/less " diff --git a/packages/swift/build.sh b/packages/swift/build.sh index 724e0f1196..a1f0f3c5a3 100644 --- a/packages/swift/build.sh +++ b/packages/swift/build.sh @@ -126,7 +126,7 @@ termux_step_host_build() { termux_step_make() { if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then - termux_setup_swift + termux_setup_swift ln -sf $TERMUX_PKG_HOSTBUILD_DIR/llvm-linux-x86_64 $TERMUX_PKG_BUILDDIR/llvm-linux-x86_64 SWIFT_BUILD_FLAGS="$SWIFT_BUILD_FLAGS --android diff --git a/packages/tar/build.sh b/packages/tar/build.sh index d0e7f68c8f..b3a939b936 100644 --- a/packages/tar/build.sh +++ b/packages/tar/build.sh @@ -19,7 +19,7 @@ termux_step_pre_configure() { CPPFLAGS+=" -D__USE_FORTIFY_LEVEL=0" LDFLAGS+=" -landroid-glob" # https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md#is-32_bit-on-lp32-y2038 - if [ $TERMUX_ARCH_BITS = 32 ]; then - TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-year2038" - fi + if [ $TERMUX_ARCH_BITS = 32 ]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-year2038" + fi } diff --git a/packages/termux-am/build.sh b/packages/termux-am/build.sh index e69da87870..c124cdeaa1 100644 --- a/packages/termux-am/build.sh +++ b/packages/termux-am/build.sh @@ -26,7 +26,7 @@ termux_step_make() { # Avoid spawning the gradle daemon due to org.gradle.jvmargs # being set (https://github.com/gradle/gradle/issues/1434): - sed -i'' -E '/^org\.gradle\.jvmargs=.*/d' gradle.properties + sed -i'' -E '/^org\.gradle\.jvmargs=.*/d' gradle.properties export ANDROID_HOME export GRADLE_OPTS="-Dorg.gradle.daemon=false -Xmx1536m -Dorg.gradle.java.home=/usr/lib/jvm/java-1.17.0-openjdk-amd64" diff --git a/packages/termux-gui-pm/build.sh b/packages/termux-gui-pm/build.sh index 9a87328d89..2f0d54c47f 100644 --- a/packages/termux-gui-pm/build.sh +++ b/packages/termux-gui-pm/build.sh @@ -20,4 +20,4 @@ termux_step_create_debscripts() { pip3 install --upgrade $TERMUX_PKG_PYTHON_TARGET_DEPS EOF } - + diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh index ee9d57c682..2901f8b77f 100644 --- a/packages/texlive-bin/build.sh +++ b/packages/texlive-bin/build.sh @@ -121,6 +121,6 @@ termux_step_pre_configure() { export HIMKTABLES=$TERMUX_PKG_HOSTBUILD_DIR/texk/web2c/himktables sed -e "s%@TERMUX_PREFIX@%$TERMUX_PREFIX%g" \ - -e "s%@YEAR@%${TERMUX_PKG_VERSION:0:4}%g" \ + -e "s%@YEAR@%${TERMUX_PKG_VERSION:0:4}%g" \ "$TERMUX_PKG_BUILDER_DIR"/texk-kpathsea-texmf.cnf.diff | patch --silent -p1 } diff --git a/packages/texlive-installer/build.sh b/packages/texlive-installer/build.sh index 5db12bd0d1..4d4a53589f 100644 --- a/packages/texlive-installer/build.sh +++ b/packages/texlive-installer/build.sh @@ -38,7 +38,7 @@ termux_step_make_install() { for DIFF in "$TERMUX_PKG_BUILDER_DIR"/*.diff; do sed -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \ - -e "s|@YEAR@|${TERMUX_PKG_VERSION:0:4}|g" $DIFF \ + -e "s|@YEAR@|${TERMUX_PKG_VERSION:0:4}|g" $DIFF \ > $TERMUX_PREFIX/opt/texlive/$(basename $DIFF) chmod 600 $TERMUX_PREFIX/opt/texlive/$(basename $DIFF) done @@ -56,13 +56,13 @@ termux_step_make_install() { echo "export OSFONTDIR=$TERMUX_PREFIX/share/fonts/TTF" echo "export TRFONTS=$TERMUX_PREFIX/share/groff/{current/font,site-font}/devps" } > $TERMUX_PREFIX/etc/profile.d/texlive.sh - { - echo "set -gx --append PATH $TERMUX_PREFIX/bin/texlive" - echo "set -gx TEXMFROOT $TERMUX_PREFIX/share/texlive/${TERMUX_PKG_VERSION:0:4}" - echo "set -gx TEXMFLOCAL $TERMUX_PREFIX/share/texlive/texmf-local" - echo "set -gx OSFONTDIR $TERMUX_PREFIX/share/fonts/TTF" - echo "set -gx TRFONTS $TERMUX_PREFIX/share/groff/current/font/devps $TERMUX_PREFIX/share/groff/site-font/devps" - } > $TERMUX_PREFIX/etc/fish/conf.d/texlive.fish + { + echo "set -gx --append PATH $TERMUX_PREFIX/bin/texlive" + echo "set -gx TEXMFROOT $TERMUX_PREFIX/share/texlive/${TERMUX_PKG_VERSION:0:4}" + echo "set -gx TEXMFLOCAL $TERMUX_PREFIX/share/texlive/texmf-local" + echo "set -gx OSFONTDIR $TERMUX_PREFIX/share/fonts/TTF" + echo "set -gx TRFONTS $TERMUX_PREFIX/share/groff/current/font/devps $TERMUX_PREFIX/share/groff/site-font/devps" + } > $TERMUX_PREFIX/etc/fish/conf.d/texlive.fish } termux_step_create_debscripts() { diff --git a/packages/unar/build.sh b/packages/unar/build.sh index a0ece96d1f..5eb0397d1d 100644 --- a/packages/unar/build.sh +++ b/packages/unar/build.sh @@ -23,7 +23,7 @@ termux_step_pre_configure() { CXXFLAGS+=" $CPPFLAGS" export OBJCC="$CC" export OBJCFLAGS="$CFLAGS -fobjc-nonfragile-abi" - export LDFLAGS+=" -landroid-utimes" + export LDFLAGS+=" -landroid-utimes" LD="$CXX" } diff --git a/packages/usql/build.sh b/packages/usql/build.sh index e3114ac814..bb9144d644 100644 --- a/packages/usql/build.sh +++ b/packages/usql/build.sh @@ -24,7 +24,7 @@ termux_step_make() { -trimpath \ -tags="$tags" \ -ldflags="-X github.com/xo/usql/text.CommandName=usql - -X github.com/xo/usql/text.CommandVersion=$TERMUX_PKG_VERSION" \ + -X github.com/xo/usql/text.CommandVersion=$TERMUX_PKG_VERSION" \ -o usql }