logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 7ca771931a35bb8d63c75719fa25b9bb8920f434
parent a7f7ca5a1a424c5ef287dfe4e79c9d62f33defba
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 19 Jun 2019 20:11:11 -0700

pigz: Only use gcc pragmas with gcc

Diffstat:

Apkg/pigz/patch/0003-Only-use-gcc-pragmas-with-gcc.patch37+++++++++++++++++++++++++++++++++++++
Mpkg/pigz/ver2+-
2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/pkg/pigz/patch/0003-Only-use-gcc-pragmas-with-gcc.patch b/pkg/pigz/patch/0003-Only-use-gcc-pragmas-with-gcc.patch @@ -0,0 +1,37 @@ +From 0e2380ea9d9c84900e317b9962c3940ae0cc1015 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 bbbfd2c..f1042a9 100644 +--- a/pigz.c ++++ b/pigz.c +@@ -3584,8 +3584,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 +@@ -3613,7 +3615,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.20.1 + diff --git a/pkg/pigz/ver b/pkg/pigz/ver @@ -1 +1 @@ -2.4 r0 +2.4 r1