Skip to content

Pass -f to patch to avoid hanging when patch is reveresed #3053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Tatskaari wants to merge 1 commit into from
Closed

Pass -f to patch to avoid hanging when patch is reveresed #3053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rules/subrepo_rules.build_defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def new_http_archive(name:str, urls:list, build_file:str=None, build_file_conten
else:
cmd = '$TOOL x $SRCS_REMOTE -o "$OUT"'
if patches:
cmd += ' && ' + ' && '.join([f'patch -d "$OUT" -p1 < "$PKG/{p}"' for p in patches])
cmd += ' && ' + ' && '.join([f'patch -f -d "$OUT" -p1 < "$PKG/{p}"' for p in patches])
if strip_build:
cmd += ' && find . ' + ' -o '.join([f'-name {name}' for name in CONFIG.BUILD_FILE_NAMES + ["WORKSPACE"]]) + ' | xargs rm -f'
if build_file:
Expand Down