From 82a78ca781b1fd0e9dfc3e22b7684c5334b78b84 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 4 Dec 2021 10:37:55 +0200 Subject: [PATCH] build-package.sh: fix undefined AR variable Building metapackages doesn't involve setup of compiler toolchain, so certain variables are not set. In general, it was not expected that package archive generation will use utilities that come with cross-compiler as this functionality should rely on utilities installed by host package manager. /home/builder/termux-packages/scripts/build/termux_step_create_debian_package.sh: line 49: AR: unbound variable --- scripts/build/termux_create_debian_subpackages.sh | 2 +- scripts/build/termux_step_create_debian_package.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/termux_create_debian_subpackages.sh b/scripts/build/termux_create_debian_subpackages.sh index 986709290..ab836e768 100644 --- a/scripts/build/termux_create_debian_subpackages.sh +++ b/scripts/build/termux_create_debian_subpackages.sh @@ -93,7 +93,7 @@ termux_create_debian_subpackages() { # Create the actual .deb file: TERMUX_SUBPKG_DEBFILE=$TERMUX_OUTPUT_DIR/${SUB_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary" - $AR cr "$TERMUX_SUBPKG_DEBFILE" \ + ${AR-ar} cr "$TERMUX_SUBPKG_DEBFILE" \ "$TERMUX_COMMON_CACHEDIR/debian-binary" \ "$SUB_PKG_PACKAGE_DIR/control.tar.xz" \ "$SUB_PKG_PACKAGE_DIR/data.tar.xz" diff --git a/scripts/build/termux_step_create_debian_package.sh b/scripts/build/termux_step_create_debian_package.sh index 298e8f529..a85093de5 100644 --- a/scripts/build/termux_step_create_debian_package.sh +++ b/scripts/build/termux_step_create_debian_package.sh @@ -46,7 +46,7 @@ termux_step_create_debian_package() { test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary" TERMUX_PKG_DEBFILE=$TERMUX_OUTPUT_DIR/${TERMUX_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb # Create the actual .deb file: - $AR cr "$TERMUX_PKG_DEBFILE" \ + ${AR-ar} cr "$TERMUX_PKG_DEBFILE" \ "$TERMUX_COMMON_CACHEDIR/debian-binary" \ "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" \ "$TERMUX_PKG_PACKAGEDIR/data.tar.xz"