From 7f2729f0dcc9e186f56269b0469cb2fb0eaad28c Mon Sep 17 00:00:00 2001
From: Nick Felt <nickfelt@google.com>
Date: Tue, 13 Apr 2021 15:15:52 -0700
Subject: [PATCH] build: patch TF python_configure to fix genrule toolchain
 issues

---
 WORKSPACE                    |  7 +++++++
 third_party/tensorflow.patch | 12 ++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 third_party/tensorflow.patch

diff --git a/WORKSPACE b/WORKSPACE
index 8ca45e6c76..a8c7ae7bc1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -90,6 +90,13 @@ http_archive(
         "http://mirror.tensorflow.org/github.com/tensorflow/tensorflow/archive/v2.3.0.tar.gz",  # 2020-07-23
         "https://github.com/tensorflow/tensorflow/archive/v2.3.0.tar.gz",
     ],
+    patches = [
+        # Patch TF's python_configure.bzl to ensure it reconfigures its python
+        # toolchain when environment variables like `PATH` and `PYTHONPATH`
+        # change, to avoid the stale genrule py_binary issue described in:
+        # https://github.com/tensorflow/tensorboard/issues/4862
+        "//third_party:tensorflow.patch",
+    ],
 )
 
 load("@org_tensorflow//tensorflow:workspace.bzl", "tf_workspace")
diff --git a/third_party/tensorflow.patch b/third_party/tensorflow.patch
new file mode 100644
index 0000000000..d035033743
--- /dev/null
+++ b/third_party/tensorflow.patch
@@ -0,0 +1,12 @@
+--- third_party/py/python_configure.bzl	1970-01-01 00:00:00.000000000 +0000
++++ third_party/py/python_configure.bzl	1970-01-01 00:00:00.000000000 +0000
+@@ -268,6 +268,9 @@ NOTE: https://github.com/tensorflow/tensorboard/issues/4862
+
+ _ENVIRONS = [
+     BAZEL_SH,
++    "PATH",
++    "PYTHONHOME",
++    "PYTHONPATH",
+     PYTHON_BIN_PATH,
+     PYTHON_LIB_PATH,
+ ]