mirror of
https://github.com/huo-ju/photoprism-freebsd-port.git
synced 2025-12-12 01:39:56 +01:00
#21 fixed
This commit is contained in:
@@ -0,0 +1,26 @@
|
||||
diff --git a/third_party/repo.bzl b/third_party/repo.bzl
|
||||
index a7506b4efe..083ebf9d6a 100644
|
||||
--- docker/tensorflow/tensorflow-1.15.2/third_party/repo.bzl.orig
|
||||
+++ docker/tensorflow/tensorflow-1.15.2/third_party/repo.bzl
|
||||
@@ -62,13 +62,15 @@ def _repos_are_siblings():
|
||||
return Label("@foo//bar").workspace_root.startswith("../")
|
||||
|
||||
# Apply a patch_file to the repository root directory
|
||||
-# Runs 'git apply' on Unix, 'patch -p1' on Windows.
|
||||
+# Runs 'patch -p1'
|
||||
def _apply_patch(ctx, patch_file):
|
||||
- if _is_windows(ctx):
|
||||
- patch_command = ["patch", "-p1", "-d", ctx.path("."), "-i", ctx.path(patch_file)]
|
||||
- else:
|
||||
- patch_command = ["git", "apply", "-v", ctx.path(patch_file)]
|
||||
- cmd = _wrap_bash_cmd(ctx, patch_command)
|
||||
+ # Don't check patch on Windows, because patch is only available under bash.
|
||||
+ if not _is_windows(ctx) and not ctx.which("patch"):
|
||||
+ fail("patch command is not found, please install it")
|
||||
+ cmd = _wrap_bash_cmd(
|
||||
+ ctx,
|
||||
+ ["patch", "-p1", "-d", ctx.path("."), "-i", ctx.path(patch_file)],
|
||||
+ )
|
||||
_execute_and_check_ret_code(ctx, cmd)
|
||||
|
||||
def _apply_delete(ctx, paths):
|
||||
Reference in New Issue
Block a user