mirror of
https://github.com/jimeh/build-emacs-for-macos.git
synced 2026-02-19 01:36:38 +00:00
fix(patches): improve chance of successful patch application by using -l
This causes patch to ignore whitespace changes, which should make it more likely to apply patches which may not be an exact match.
This commit is contained in:
@@ -1159,7 +1159,9 @@ class Build
|
||||
|
||||
if patch[:file]
|
||||
info 'Applying patch...'
|
||||
FileUtils.cd(target) { run_cmd('patch', '-f', '-p1', '-i', patch[:file]) }
|
||||
FileUtils.cd(target) do
|
||||
run_cmd('patch', '-f', '-p1', '-l', '-i', patch[:file])
|
||||
end
|
||||
elsif patch[:url]
|
||||
patch_dir = "#{target}/macos_patches"
|
||||
run_cmd('mkdir', '-p', patch_dir)
|
||||
|
||||
Reference in New Issue
Block a user