sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-package: switch the archiver for debian packages over to the one from the NDK, which gets on-device builds working again 

Also, remove the binutils-gold dependency for on-device builds, since we switched
everything over to lld now, just like the latest NDK 23.
This commit is contained in:
Butta 2021-11-14 12:41:53 +05:30
parent 1566ce500c
commit 034874f693
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build/termux_create_debian_subpackages.sh
View File

@ -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 cr "$TERMUX_SUBPKG_DEBFILE" \
"$TERMUX_COMMON_CACHEDIR/debian-binary" \
"$SUB_PKG_PACKAGE_DIR/control.tar.xz" \
"$SUB_PKG_PACKAGE_DIR/data.tar.xz"

2
scripts/build/termux_step_create_debian_package.sh
View File

@ -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 cr "$TERMUX_PKG_DEBFILE" \
"$TERMUX_COMMON_CACHEDIR/debian-binary" \
"$TERMUX_PKG_PACKAGEDIR/control.tar.xz" \
"$TERMUX_PKG_PACKAGEDIR/data.tar.xz"

1
scripts/setup-termux.sh
View File

@ -2,7 +2,6 @@
PACKAGES=""
# Tier 1: requirements for the core build scripts in scripts/build/.
PACKAGES+=" binutils-gold" # Part of binutils which is dependency of clang.
PACKAGES+=" clang" # Required for termux-elf-cleaner and C/C++ packages.
PACKAGES+=" file" # Used in termux_step_massage().
PACKAGES+=" gnupg" # Used in termux_get_repo_files() and build-package.sh.