pigz: update to 2.5

This commit is contained in:
Henrik Grimler 2021-02-04 20:50:44 +01:00
parent 9711425bf5
commit 9550c09dd0
4 changed files with 20 additions and 30 deletions

View File

@ -0,0 +1,18 @@
--- ./Makefile.orig 2021-02-04 19:47:43.746288080 +0000
+++ ./Makefile 2021-02-04 19:48:32.749583554 +0000
@@ -1,11 +1,11 @@
-CC=gcc
-CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas -Wcast-qual
-LDFLAGS=
+CC?=gcc
+CFLAGS+=-Wall -Wextra -Wno-unknown-pragmas
+LDFLAGS?=
# CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas -Wcast-qual -g -fsanitize=thread
# LDFLAGS=-g -fsanitize=thread
# CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas -Wcast-qual -g -fsanitize=address
# LDFLAGS=-g -fsanitize=address
-LIBS=-lm -lpthread -lz
+LIBS=-lm -lz
ZOPFLI=zopfli/src/zopfli/
ZOP=deflate.o blocksplitter.o tree.o lz77.o cache.o hash.o util.o squeeze.o katajainen.o symbols.o

View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.zlib.net/pigz
TERMUX_PKG_DESCRIPTION="Parallel implementation of the gzip file compressor"
TERMUX_PKG_LICENSE="ZLIB"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.4
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=2.5
TERMUX_PKG_SRCURL=https://www.zlib.net/pigz/pigz-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73
TERMUX_PKG_SHA256=a006645702caaecace633a89eb5c371482b44a48d04f34e0058e2b85d75d4c36
TERMUX_PKG_DEPENDS="zlib"
TERMUX_PKG_BUILD_IN_SRC=true

View File

@ -1,15 +0,0 @@
diff -uNr pigz-2.4/Makefile pigz-2.4.mod/Makefile
--- pigz-2.4/Makefile 2017-12-27 02:35:01.000000000 +0200
+++ pigz-2.4.mod/Makefile 2019-09-23 22:45:25.088019565 +0300
@@ -1,7 +1,7 @@
-CC=gcc
-CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas
-LDFLAGS=
-LIBS=-lm -lpthread -lz
+CC?=gcc
+CFLAGS+=-Wall -Wextra -Wno-unknown-pragmas
+LDFLAGS?=
+LIBS=-lz -lm
ZOPFLI=zopfli/src/zopfli/
ZOP=deflate.o blocksplitter.o tree.o lz77.o cache.o hash.o util.o squeeze.o katajainen.o

View File

@ -1,12 +0,0 @@
diff -uNr pigz-2.4/yarn.c pigz-2.4.mod/yarn.c
--- pigz-2.4/yarn.c 2015-01-20 06:12:31.000000000 +0200
+++ pigz-2.4.mod/yarn.c 2019-09-23 22:45:59.981446648 +0300
@@ -374,7 +374,7 @@
{
int ret;
- if ((ret = pthread_cancel(off_course->id)) != 0)
+ if ((ret = pthread_kill(off_course->id, 0)) != 0)
fail(ret);
join(off_course);
}