lukechilds
/
termux-packages
mirror of https://github.com/lukechilds/termux-packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Change TERMUX_BUILD_DEPS to TERMUX_INSTALL_DEPS again. 

Fix syntax in if expressions.
android-5
Henrik Grimler 6 years ago
parent
5e27e3c096
commit
59da760394
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      build-package.sh

10
build-package.sh
View File

@ -267,7 +267,7 @@ termux_step_handle_arguments() {
d) export TERMUX_DEBUG=true;; d) export TERMUX_DEBUG=true;;
D) local TERMUX_IS_DISABLED=true;; D) local TERMUX_IS_DISABLED=true;;
f) TERMUX_FORCE_BUILD=true;; f) TERMUX_FORCE_BUILD=true;;
i) TERMUX_BUILD_DEPS=true;; i) export TERMUX_INSTALL_DEPS=true;;
q) export TERMUX_QUIET_BUILD=true;; q) export TERMUX_QUIET_BUILD=true;;
s) export TERMUX_SKIP_DEPCHECK=true;; s) export TERMUX_SKIP_DEPCHECK=true;;
o) TERMUX_DEBDIR="$(realpath -m $OPTARG)";; o) TERMUX_DEBDIR="$(realpath -m $OPTARG)";;
@ -324,7 +324,7 @@ termux_step_setup_variables() {
: "${TERMUX_PKG_API_LEVEL:="21"}" : "${TERMUX_PKG_API_LEVEL:="21"}"
: "${TERMUX_DEBDIR:="${TERMUX_SCRIPTDIR}/debs"}" : "${TERMUX_DEBDIR:="${TERMUX_SCRIPTDIR}/debs"}"
: "${TERMUX_SKIP_DEPCHECK:="false"}" : "${TERMUX_SKIP_DEPCHECK:="false"}"
: "${TERMUX_BUILD_DEPS:="false"}" : "${TERMUX_INSTALL_DEPS:="false"}"
: "${TERMUX_REPO_URL:="https://termux.net/dists/stable/main"}" : "${TERMUX_REPO_URL:="https://termux.net/dists/stable/main"}"
if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then
@ -474,7 +474,7 @@ termux_step_start_build() {
fi fi
local TERMUX_ALL_DEPS=$(./scripts/buildorder.py "$TERMUX_PKG_BUILDER_DIR") local TERMUX_ALL_DEPS=$(./scripts/buildorder.py "$TERMUX_PKG_BUILDER_DIR")
if [ ! $TERMUX_SKIP_DEPCHECK ] && [ ! $TERMUX_BUILD_DEPS ]; then if [ "$TERMUX_SKIP_DEPCHECK" = false ] && [ "$TERMUX_INSTALL_DEPS" = true ]; then
# Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build) # Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build)
mkdir -p "$TERMUX_COMMON_CACHEDIR" \ mkdir -p "$TERMUX_COMMON_CACHEDIR" \
"$TERMUX_COMMON_CACHEDIR-$TERMUX_ARCH" \ "$TERMUX_COMMON_CACHEDIR-$TERMUX_ARCH" \
@ -505,7 +505,7 @@ termux_step_start_build() {
read dep_arch dep_version <<< $(termux_extract_dep_info "$pkg") read dep_arch dep_version <<< $(termux_extract_dep_info "$pkg")
termux_install_dep_deb $(basename $pkg) $dep_arch $dep_version termux_install_dep_deb $(basename $pkg) $dep_arch $dep_version
done done
elif [ ! $TERMUX_SKIP_DEPCHECK ] && [ $TERMUX_BUILD_DEPS ]; then elif [ "$TERMUX_SKIP_DEPCHECK" = false ] && [ "$TERMUX_INSTALL_DEPS" = false ]; then
# Build dependencies # Build dependencies
local pkg local pkg
for pkg in $TERMUX_ALL_DEPS; do for pkg in $TERMUX_ALL_DEPS; do
@ -523,7 +523,7 @@ termux_step_start_build() {
TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_REVISION" TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_REVISION"
fi fi
if [ "$TERMUX_DEBUG" == "true" ]; then if [ "$TERMUX_DEBUG" = true ]; then
if [ "$TERMUX_PKG_HAS_DEBUG" == "yes" ]; then if [ "$TERMUX_PKG_HAS_DEBUG" == "yes" ]; then
DEBUG="-dbg" DEBUG="-dbg"
else else

Write Preview
Loading…
Cancel
Save