From ecb6205697ebc6959489ba77d3fe5c0b0d3e2a5a Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 2 Oct 2023 01:08:35 -0500
Subject: system/pigz: Build static instead of shared

Also uses our own CFLAGS, which is generally a good idea.

Fixes: #1063
---
 system/pigz/APKBUILD          | 11 +++++++----
 system/pigz/allow-flags.patch | 12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 system/pigz/allow-flags.patch

(limited to 'system/pigz')

diff --git a/system/pigz/APKBUILD b/system/pigz/APKBUILD
index 44ebab127..a595a062e 100644
--- a/system/pigz/APKBUILD
+++ b/system/pigz/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=pigz
 pkgver=2.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Parallel implementation of gzip"
 url="https://zlib.net/pigz/"
 arch="all"
@@ -10,10 +10,12 @@ license="zlib"
 depends=""
 makedepends="zlib-dev cmd:which"
 subpackages="$pkgname-doc"
-source="https://zlib.net/pigz/pigz-$pkgver.tar.gz"
+source="https://zlib.net/pigz/pigz-$pkgver.tar.gz
+	allow-flags.patch
+	"
 
 build() {
-	make pigz
+	LDFLAGS="-static" make pigz
 }
 
 check() {
@@ -29,4 +31,5 @@ package() {
 	install -m644 pigz.1 "$pkgdir"/usr/share/man/man1
 }
 
-sha512sums="ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f  pigz-2.8.tar.gz"
+sha512sums="ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f  pigz-2.8.tar.gz
+5b899e78aa1e169b05f1e80e7e72f2ab11556da5e4de9ea85aadac00d24cfdaf34bc6b0535a103411003414365e1d4e0e584dce712fdad1c3ecd82da07d2263d  allow-flags.patch"
diff --git a/system/pigz/allow-flags.patch b/system/pigz/allow-flags.patch
new file mode 100644
index 000000000..b7b2b5a59
--- /dev/null
+++ b/system/pigz/allow-flags.patch
@@ -0,0 +1,12 @@
+--- pigz-2.8/Makefile.old	2019-04-11 03:39:47.000000000 -0500
++++ pigz-2.8/Makefile	2023-10-02 01:07:29.659463951 -0500
+@@ -1,6 +1,6 @@
+-CC=gcc
+-CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas -Wcast-qual
+-LDFLAGS=
++CC ?= gcc
++CFLAGS ?= -O3 -Wall -Wextra -Wno-unknown-pragmas -Wcast-qual
++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
-- 
cgit v1.2.3-60-g2f50