From fa60d7445d1d379e2b681dcb22e28c8fdff8cebb Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Fri, 29 Mar 2019 11:55:59 +0100
Subject: [PATCH] Update bazel build

note: protobuf is broken on v3.7.1 see
https://github.com/protocolbuffers/protobuf/issues/5472
---
 WORKSPACE   | 25 ++++++++++++++++++-------
 bazel/BUILD |  1 +
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 072585902a..a0293603b1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,31 +1,42 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository")
 
-http_archive(
+git_repository(
     name = "com_github_gflags_gflags",
-    sha256 = "19713a36c9f32b33df59d1c79b4958434cb005b5b47dc5400a7a4b078111d9b5",
-    strip_prefix = "gflags-2.2.2",
-    urls = ["https://github.com/gflags/gflags/archive/v2.2.2.zip"],
+    commit = "e171aa2",  # release v2.2.2
+    remote = "https://github.com/gflags/gflags.git",
 )
 
 git_repository(
     name = "com_github_glog_glog",
-    commit = "41f4bf9cbc3e8995d628b459f6a239df43c2b84a",
+    commit = "96a2f23",  # release v0.4.0
     remote = "https://github.com/google/glog.git",
 )
 
+git_repository(
+    name = "bazel_skylib",
+    commit = "3721d32",  # release 0.8.0
+    remote = "https://github.com/bazelbuild/bazel-skylib.git",
+)
+
 git_repository(
     name = "com_google_protobuf",
-    commit = "6973c3a",
+    commit = "f425b9f",
+#    commit = "6973c3a",  # release v7.3.1
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )
 
 git_repository(
     name = "com_google_protobuf_cc",
-    commit = "6973c3a",
+    commit = "f425b9f",
+#    commit = "6973c3a",  # release v7.3.1
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )
 
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+# Load common dependencies.
+protobuf_deps()
+
 git_repository(
     name = "com_google_absl",
     commit = "bf29470",
diff --git a/bazel/BUILD b/bazel/BUILD
index e1bef9c2d1..408c49e008 100644
--- a/bazel/BUILD
+++ b/bazel/BUILD
@@ -2,4 +2,5 @@ exports_files([
     "gtest.BUILD",
     "glpk.BUILD",
     "swig.BUILD",
+#    "zlib.BUILD",
 ])