From 08add38deb2551cde76ddc74de30e1c717a20a2f Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 26 Oct 2016 05:28:01 -0800
Subject: [PATCH] Upgrade build-from-source swig version to 3.0.8 to avoid
 python 3.5 issues

This should address some of the ongoing python 3.5-related build failures in:
nightly-matrix-cpu
nightly-matrix-linux-gpu
nightly-matrix-mac-gpu
nightly-python35-linux-cpu
Change: 137268906
---
 tensorflow/workspace.bzl | 6 +++---
 third_party/swig.BUILD   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index a28a29fc26e..0eeea1fee75 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -136,9 +136,9 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
 
   native.new_http_archive(
     name = "swig",
-    sha256 = "a2669657cabcedc371f63c0457407a183e0b6b2ef4e7e303c1ec9a3964cc7813",
-    url = "http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.2/swig-3.0.2.tar.gz",
-    strip_prefix = "swig-3.0.2",
+    sha256 = "58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453",
+    url = "http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
+    strip_prefix = "swig-3.0.8",
     build_file = str(Label("//third_party:swig.BUILD")),
   )
 
diff --git a/third_party/swig.BUILD b/third_party/swig.BUILD
index 0ec413a2480..bea5d6b5314 100644
--- a/third_party/swig.BUILD
+++ b/third_party/swig.BUILD
@@ -291,7 +291,7 @@ genrule(
           "#define HAVE_PCRE\n" +
           "#define HAVE_POPEN\n" +
           "#define PACKAGE_BUGREPORT \"http://www.swig.org\"\n" +
-          "#define PACKAGE_VERSION \"3.0.2\"\n" +
+          "#define PACKAGE_VERSION \"3.0.8\"\n" +
           "#define STDC_HEADERS\n" +
           "#define SWIG_CXX \"bazel4lyfe\"\n" +
           "#define SWIG_LIB \"external/swig/Lib\"\n" +
@@ -323,6 +323,7 @@ genrule(
           "    -e '/swig_pike/d'" +
           "    -e '/swig_r/d'" +
           "    -e '/swig_ruby/d'" +
+          "    -e '/swig_scilab/d'" +
           "    -e '/swig_sexp/d'" +
           "    -e '/swig_tcl/d'" +
           "    -e '/swig_uffi/d'" +