diff --git a/packages/plzip/Makefile.in.patch b/packages/plzip/Makefile.in.patch deleted file mode 100644 index b3091ebde1..0000000000 --- a/packages/plzip/Makefile.in.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr plzip-1.8/Makefile.in plzip-1.8.mod/Makefile.in ---- plzip-1.8/Makefile.in 2018-10-12 00:56:58.000000000 +0300 -+++ plzip-1.8.mod/Makefile.in 2019-09-23 19:39:16.088047518 +0300 -@@ -4,7 +4,7 @@ - INSTALL_PROGRAM = $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -d -m 755 --LIBS = -llz -lpthread -+LIBS = -llz - SHELL = /bin/sh - CAN_RUN_INSTALLINFO = $(SHELL) -c "install-info --version" > /dev/null 2>&1 - diff --git a/packages/plzip/build.sh b/packages/plzip/build.sh index b41be33fde..482a552845 100644 --- a/packages/plzip/build.sh +++ b/packages/plzip/build.sh @@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/lzip/plzip.html TERMUX_PKG_DESCRIPTION="A massively parallel lossless data compressor based on the lzlib compression library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.9 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=1.10 TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/lzip/plzip/plzip-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=14d8d1db8dde76bdd9060b59d50b2943417eb4c0fbd2b84736546b78fab5f1a7 +TERMUX_PKG_SHA256=43faa58265d8b89ad75bd4ed11d347ef10065a8070748bc1ed0e06f191458098 TERMUX_PKG_DEPENDS="libc++, lzlib" diff --git a/packages/plzip/configure.patch b/packages/plzip/configure.patch index 92fc36e1e3..2ff652ec61 100644 --- a/packages/plzip/configure.patch +++ b/packages/plzip/configure.patch @@ -1,7 +1,6 @@ -diff -uNr plzip-1.8/configure plzip-1.8.mod/configure ---- plzip-1.8/configure 2019-01-04 20:33:44.000000000 +0200 -+++ plzip-1.8.mod/configure 2019-09-23 19:37:59.464411919 +0300 -@@ -21,10 +21,10 @@ +--- a/configure ++++ b/configure +@@ -21,11 +21,11 @@ datarootdir='$(prefix)/share' infodir='$(datarootdir)/info' mandir='$(datarootdir)/man' @@ -9,10 +8,12 @@ diff -uNr plzip-1.8/configure plzip-1.8.mod/configure -CPPFLAGS= -CXXFLAGS='-Wall -W -O2' -LDFLAGS= +-LIBS='-llz -lpthread' +CXX?=g++ +CPPFLAGS?= +CXXFLAGS?='-Wall -W -O2' +LDFLAGS?= ++LIBS='-llz' # checking whether we are using GNU C++. - /bin/sh -c "${CXX} --version" > /dev/null 2>&1 || + /bin/sh -c "${CXX} --version" > /dev/null 2>&1 || { CXX=c++ ; CXXFLAGS=-O2 ; }