mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
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 <sam@gentoo.org>
This commit is contained in:
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user