logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: c884f525a22dfa5452858946525f09c5dd73cd96
parent dcfaf6e5eddcca994201e45a1b6c7e8a80eccc81
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  2 Mar 2021 03:23:33 -0800

pigz: Update to 2.6

Diffstat:

M.gitmodules1-
Dpkg/pigz/patch/0001-Make-try_throw_-_Noreturn.patch25-------------------------
Dpkg/pigz/patch/0002-Only-use-gcc-pragmas-with-gcc.patch37-------------------------------------
Mpkg/pigz/ver2+-
4 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -252,7 +252,6 @@ [submodule "pkg/pigz/src"] path = pkg/pigz/src url = https://github.com/madler/pigz - ignore = all [submodule "pkg/pixman/src"] path = pkg/pixman/src url = https://anongit.freedesktop.org/git/pixman.git diff --git a/pkg/pigz/patch/0001-Make-try_throw_-_Noreturn.patch b/pkg/pigz/patch/0001-Make-try_throw_-_Noreturn.patch @@ -1,25 +0,0 @@ -From ffccc08ae58e231589224d0297473d96e11e4916 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Tue, 26 Dec 2017 23:44:19 -0800 -Subject: [PATCH] Make try_throw_ _Noreturn - ---- - try.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/try.h b/try.h -index 03289dd..7d78ffe 100644 ---- a/try.h -+++ b/try.h -@@ -418,7 +418,7 @@ struct try_s_ { - to make use of any arguments after the 0 anyway. - - try.c must be compiled and linked to provide the try_throw_() function. */ --void try_throw_(int code, char *fmt, ...); -+_Noreturn void try_throw_(int code, char *fmt, ...); - #define TRY_THROW_(...) try_throw_(__VA_ARGS__, NULL) - - /* Retry the try block. This will start over at the beginning of the try --- -2.15.1 - diff --git a/pkg/pigz/patch/0002-Only-use-gcc-pragmas-with-gcc.patch b/pkg/pigz/patch/0002-Only-use-gcc-pragmas-with-gcc.patch @@ -1,37 +0,0 @@ -From e8c1ae5d700e447d21db95d0be0f64fd634fa9a6 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Wed, 19 Jun 2019 20:10:09 -0700 -Subject: [PATCH] Only use gcc pragmas with gcc - ---- - pigz.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pigz.c b/pigz.c -index e5a094a..a65e243 100644 ---- a/pigz.c -+++ b/pigz.c -@@ -3800,8 +3800,10 @@ local char *justname(char *path) { - return p == NULL ? path : p + 1; - } - -+#ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-result" -+#endif - - // Copy file attributes, from -> to, as best we can. This is best effort, so no - // errors are reported. The mode bits, including suid, sgid, and the sticky bit -@@ -3829,7 +3831,9 @@ local void copymeta(char *from, char *to) { - (void)utimes(to, times); - } - -+#ifdef __GNUC__ - #pragma GCC diagnostic pop -+#endif - - // Set the access and modify times of fd to t. - local void touch(char *path, time_t t) { --- -2.30.0 - diff --git a/pkg/pigz/ver b/pkg/pigz/ver @@ -1 +1 @@ -2.5 r0 +2.6 r0