bump gflags to 2.2.2; use latest commit on glog to benefit from included build file before v0.4.0

WORKSPACE

@@ -2,18 +2,19 @@ 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")
 
 #Import the gflags files.
-git_repository(
+http_archive(
     name = "com_github_gflags_gflags",
-    commit = "f8a0efe03aa69b3336d8e228b37d4ccb17324b88",
-    remote = "https://github.com/gflags/gflags.git",
+    sha256 = "19713a36c9f32b33df59d1c79b4958434cb005b5b47dc5400a7a4b078111d9b5",
+    strip_prefix = "gflags-2.2.2",
+    urls = ["https://github.com/gflags/gflags/archive/v2.2.2.zip"],
 )
 
+
 #Import the glog files.
-new_git_repository(
+git_repository(
     name = "com_github_glog_glog",
-    build_file = "//bazel:glog.BUILD",
+    commit = "41f4bf9cbc3e8995d628b459f6a239df43c2b84a",
     remote = "https://github.com/google/glog.git",
-    tag = "v0.3.5",
 )
 
 http_archive(

bazel/glog.BUILD

@@ -1,82 +0,0 @@
-cc_library(
-    name = "glog",
-    srcs = [
-        "config.h",
-        "src/base/commandlineflags.h",
-        "src/base/googleinit.h",
-        "src/base/mutex.h",
-        "src/demangle.cc",
-        "src/demangle.h",
-        "src/logging.cc",
-        "src/raw_logging.cc",
-        "src/signalhandler.cc",
-        "src/symbolize.cc",
-        "src/symbolize.h",
-        "src/utilities.cc",
-        "src/utilities.h",
-        "src/vlog_is_on.cc",
-    ] + glob(["src/stacktrace*.h"]),
-    hdrs = [
-        "src/glog/log_severity.h",
-        "src/glog/logging.h",
-        "src/glog/raw_logging.h",
-        "src/glog/stl_logging.h",
-        "src/glog/vlog_is_on.h",
-    ],
-    copts = [
-        "-Wno-sign-compare",
-        "-U_XOPEN_SOURCE",
-    ],
-    includes = ["./src"],
-    linkopts = ["-lpthread"] + select({
-        ":libunwind": ["-lunwind"],
-        "//conditions:default": [],
-    }),
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_github_gflags_gflags//:gflags",
-    ],
-)
-
-config_setting(
-    name = "libunwind",
-    values = {
-        "define": "libunwind=true",
-    },
-)
-
-genrule(
-    name = "run_configure",
-    srcs = [
-        "README",
-        "Makefile.in",
-        "config.guess",
-        "config.sub",
-        "install-sh",
-        "ltmain.sh",
-        "missing",
-        "libglog.pc.in",
-        "src/config.h.in",
-        "src/glog/logging.h.in",
-        "src/glog/raw_logging.h.in",
-        "src/glog/stl_logging.h.in",
-        "src/glog/vlog_is_on.h.in",
-    ],
-    outs = [
-        "config.h",
-        "src/glog/logging.h",
-        "src/glog/raw_logging.h",
-        "src/glog/stl_logging.h",
-        "src/glog/vlog_is_on.h",
-    ],
-    tools = [
-        "configure",
-    ],
-    cmd = "$(location :configure)" +
-          "&& cp -v src/config.h $(location config.h) " +
-          "&& cp -v src/glog/logging.h $(location src/glog/logging.h) " +
-          "&& cp -v src/glog/raw_logging.h $(location src/glog/raw_logging.h) " +
-          "&& cp -v src/glog/stl_logging.h $(location src/glog/stl_logging.h) " +
-          "&& cp -v src/glog/vlog_is_on.h $(location src/glog/vlog_is_on.h) "
-    ,
-)

ortools/flatzinc/BUILD

@@ -263,8 +263,6 @@ cc_binary(
         ":parser_lib",
         ":presolve",
         ":reporting",
-        ":solver",
-        ":solver_util",
         "//ortools/base",
         "//ortools/base:threadpool",
     ],