From c43281eac24421ec01ab38da8e62f9e1a5cd9dcc Mon Sep 17 00:00:00 2001
From: Jon Poole <jpoole@thoughtmachine.net>
Date: Tue, 23 Jan 2024 11:54:17 +0000
Subject: [PATCH] Pass -f to patch to avoid hanging when patch is reveresed

---
 rules/subrepo_rules.build_defs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/subrepo_rules.build_defs b/rules/subrepo_rules.build_defs
index d1c67dabd5..a0832d860f 100644
--- a/rules/subrepo_rules.build_defs
+++ b/rules/subrepo_rules.build_defs
@@ -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: