Skip to content

Commit d396165

Browse files
committed
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.
1 parent 66ccd9c commit d396165

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

build-emacs-for-macos

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,9 @@ class Build
11591159

11601160
if patch[:file]
11611161
info 'Applying patch...'
1162-
FileUtils.cd(target) { run_cmd('patch', '-f', '-p1', '-i', patch[:file]) }
1162+
FileUtils.cd(target) do
1163+
run_cmd('patch', '-f', '-p1', '-l', '-i', patch[:file])
1164+
end
11631165
elsif patch[:url]
11641166
patch_dir = "#{target}/macos_patches"
11651167
run_cmd('mkdir', '-p', patch_dir)

0 commit comments

Comments
 (0)