diff --git a/WORKSPACE b/WORKSPACE index 00f77852e..450bc6a65 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -28,11 +28,10 @@ git_repository( tag = "v2.2.2", ) -new_git_repository( +git_repository( name = "com_github_google_glog", - build_file = "//bazel:BUILD.glog", - remote = "https://github.com/google/glog.git", - tag = "v0.3.5", + commit = "5c576f78c49b28d89b23fbb1fc80f54c879ec02e", + remote = "https://github.com/google/glog", ) new_git_repository( diff --git a/bazel/BUILD.glog b/bazel/BUILD.glog deleted file mode 100644 index 80c71f35c..000000000 --- a/bazel/BUILD.glog +++ /dev/null @@ -1,84 +0,0 @@ -# This file is from https://github.com/google/or-tools/blob/master/bazel/glog.BUILD - -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) " - , -)