From 6b451c07ade87ac16cc79d9b7677c1b03ecf4ee7 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Mon, 4 Nov 2024 15:11:55 +0100
Subject: [PATCH] abuild: set POSIXLY_CORRECT=1 when using patch
gnu patch creates .orig files when the patch didn't match exactly. This
can cause additional files in the build output or even build failures.
When POSIXLY_CORRECT is set gnu patch uses the posix behaviour which is
to not create .orig files.
Ref https://pkgs.alpinelinux.org/contents?file=*.orig&arch=x86_64
---
abuild.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abuild.in b/abuild.in
index 2b879763..aeb4d8de 100644
--- a/abuild.in
+++ b/abuild.in
@@ -737,15 +737,15 @@ default_prepare() {
case ${i%::*} in
*.patch)
msg "${i%::*}"
- patch ${patch_args:--p1} -i "$srcdir/$(filename_from_uri $i)" || failed="$failed $i"
+ POSIXLY_CORRECT=1 patch ${patch_args:--p1} -i "$srcdir/$(filename_from_uri $i)" || failed="$failed $i"
;;
*.patch.gz)
msg "${i%::*}"
- gunzip -c "$srcdir/$(filename_from_uri $i)" | patch ${patch_args:--p1} || failed="$failed $i"
+ gunzip -c "$srcdir/$(filename_from_uri $i)" | POSIXLY_CORRECT=1 patch ${patch_args:--p1} || failed="$failed $i"
;;
*.patch.xz)
msg "${i%::*}"
- unxz -c "$srcdir/$(filename_from_uri $i)" | patch ${patch_args:--p1} || failed="$failed $i"
+ unxz -c "$srcdir/$(filename_from_uri $i)" | POSIXLY_CORRECT=1 patch ${patch_args:--p1} || failed="$failed $i"
;;
esac
done
--
GitLab