diff options
| author |  Justine Tunney <jart@google.com> | 2018-04-04 22:37:42 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-04-04 22:42:17 -0700 |
| commit | 007e3e6c3d72ea5edca361eb908fb7aa66ac6d6d (patch) | |
| tree | 951150d196bcab68a4e16a31ac739d1fc93d944f | |
| parent | aa890776f062f3429bcedb0a080b712ebb97793b (diff) | |
Upgrade zlib to latest version
PiperOrigin-RevId: 191696213
| -rw-r--r-- | tensorflow/workspace.bzl | 8 | ||||
| -rw-r--r-- | third_party/zlib.BUILD | 16 |
2 files changed, 6 insertions, 18 deletions
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 2510d369fc..cd8b6f83a9 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -503,11 +503,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""): tf_http_archive( name = "zlib_archive", urls = [ - "https://mirror.bazel.build/zlib.net/zlib-1.2.8.tar.gz", - "http://zlib.net/fossils/zlib-1.2.8.tar.gz", + "https://mirror.bazel.build/zlib.net/zlib-1.2.11.tar.gz", + "https://zlib.net/zlib-1.2.11.tar.gz", ], - sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d", - strip_prefix = "zlib-1.2.8", + sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1", + strip_prefix = "zlib-1.2.11", build_file = clean_dep("//third_party:zlib.BUILD"), ) diff --git a/third_party/zlib.BUILD b/third_party/zlib.BUILD index d164ee719c..e8048dd98a 100644 --- a/third_party/zlib.BUILD +++ b/third_party/zlib.BUILD @@ -2,18 +2,6 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # BSD/MIT-like license (for zlib) -config_setting( - name = "windows", - values = {"cpu": "x64_windows"}, - visibility = ["//visibility:public"], -) - -config_setting( - name = "windows_msvc", - values = {"cpu": "x64_windows_msvc"}, - visibility = ["//visibility:public"], -) - cc_library( name = "zlib", srcs = [ @@ -45,8 +33,8 @@ cc_library( ], hdrs = ["zlib.h"], copts = select({ - ":windows": [], - ":windows_msvc": [], + "@org_tensorflow//tensorflow:windows": [], + "@org_tensorflow//tensorflow:windows_msvc": [], "//conditions:default": [ "-Wno-shift-negative-value", "-DZ_HAVE_UNISTD_H", |