From f885ec7f82c4714f081a09f314cacc380f4e4230 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 29 Jul 2026 20:45:38 +0100 Subject: [PATCH] app-arch/7zip: edos2unix-ify all files, not just ones we need for PATCHES This is more friendly both to future patches we may want to add in the ebuild but also user patches. Bug: https://bugs.gentoo.org/929025 Signed-off-by: Sam James --- app-arch/7zip/7zip-26.02-r1.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-arch/7zip/7zip-26.02-r1.ebuild b/app-arch/7zip/7zip-26.02-r1.ebuild index 51c437a9ca095..2f8bf71dfbf2c 100644 --- a/app-arch/7zip/7zip-26.02-r1.ebuild +++ b/app-arch/7zip/7zip-26.02-r1.ebuild @@ -61,9 +61,11 @@ pkg_setup() { src_prepare() { # patch doesn't deal with CRLF even if file+patch match - # not even with --ignore-whitespace, --binary or --force + # not even with --ignore-whitespace, --binary or --force. We only + # strictly need to convert the .mk files we patch but do everything + # to allow easily patching in future + facilitate user patches. pushd "./CPP/7zip" || die "Unable to switch directory" - edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak + edos2unix $(find . -type 'f' || die) sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror" popd >/dev/null || die "Unable to switch directory"