From: tomty89 <tom.ty89@gmail.com>
Date: Sun, 22 Apr 2018 22:06:26 +0000 (+0800)
Subject: (un)zip: fix bip2 support (#2364)
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/81299d0c4e158319ea08df3b6358c8bf1b8f099d

(un)zip: fix bip2 support (#2364)

* zip: depends on libbz2 instead of bzip2

* unzip: enable bzip2 support
---

diff --git a/packages/unzip/build.sh b/packages/unzip/build.sh
index e668acd4..421676b9 100644
--- a/packages/unzip/build.sh
+++ b/packages/unzip/build.sh
@@ -1,10 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://www.info-zip.org/
 TERMUX_PKG_DESCRIPTION="Tools for working with zip files"
 TERMUX_PKG_VERSION=6.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/infozip/unzip60.tar.gz
 TERMUX_PKG_SHA256=036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
-TERMUX_PKG_DEPENDS="libandroid-support"
+TERMUX_PKG_DEPENDS="libandroid-support, libbz2"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_configure () {
@@ -12,5 +12,5 @@ termux_step_configure () {
 }
 
 termux_step_make () {
-	LD="$CC $LDFLAGS" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS -DNO_LCHMOD" make -j $TERMUX_MAKE_PROCESSES generic
+	LD="$CC $LDFLAGS -lbz2" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS -DNO_LCHMOD -DUSE_BZIP2" make -j $TERMUX_MAKE_PROCESSES generic
 }
diff --git a/packages/zip/build.sh b/packages/zip/build.sh
index 6cbaaba1..2f18e0a6 100644
--- a/packages/zip/build.sh
+++ b/packages/zip/build.sh
@@ -1,10 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://www.info-zip.org/
 TERMUX_PKG_DESCRIPTION="Tools for working with zip files"
 TERMUX_PKG_VERSION=3.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/infozip/zip30.tar.gz
 TERMUX_PKG_SHA256=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
-TERMUX_PKG_DEPENDS="libandroid-support,bzip2"
+TERMUX_PKG_DEPENDS="libandroid-support, libbz2"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_configure () {