This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new ff7093f Updated glog and gflags libraries (#3728)
ff7093f is described below
commit ff7093f95c479cdd45278f1698c6a4782678219c
Author: choi se <[email protected]>
AuthorDate: Tue Nov 9 08:46:22 2021 +0900
Updated glog and gflags libraries (#3728)
---
WORKSPACE | 13 ++++---
third_party/glog/glog.BUILD | 85 ---------------------------------------------
2 files changed, 6 insertions(+), 92 deletions(-)
diff --git a/WORKSPACE b/WORKSPACE
index 1123eff..ba45fc5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -251,9 +251,9 @@ http_archive(
# 3rdparty C++ dependencies
http_archive(
name = "com_github_gflags_gflags",
- sha256 =
"ae27cdbcd6a2f935baa78e4f21f675649271634c092b1be01469440495609d0e",
- strip_prefix = "gflags-2.2.1",
- urls = ["https://github.com/gflags/gflags/archive/v2.2.1.tar.gz";],
+ sha256 =
"34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf",
+ strip_prefix = "gflags-2.2.2",
+ urls = ["https://github.com/gflags/gflags/archive/v2.2.2.tar.gz";],
)
http_archive(
@@ -292,10 +292,9 @@ http_archive(
http_archive(
name = "com_github_google_glog",
- build_file = "@//:third_party/glog/glog.BUILD",
- sha256 =
"7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0",
- strip_prefix = "glog-0.3.5",
- urls = ["https://github.com/google/glog/archive/v0.3.5.tar.gz";],
+ sha256 =
"21bc744fb7f2fa701ee8db339ded7dce4f975d0d55837a97be7d46e8382dea5a",
+ strip_prefix = "glog-0.5.0",
+ urls = ["https://github.com/google/glog/archive/v0.5.0.zip";],
)
http_archive(
diff --git a/third_party/glog/glog.BUILD b/third_party/glog/glog.BUILD
deleted file mode 100644
index 716c38c..0000000
--- a/third_party/glog/glog.BUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-licenses(["notice"])
-
-package(default_visibility = ["//visibility:public"])
-
-config_setting(
- name = "darwin",
- values = {
- "cpu": "darwin",
- },
- visibility = ["//visibility:public"],
-)
-
-config_setting(
- name = "k8",
- values = {
- "cpu": "k8",
- },
- visibility = ["//visibility:public"],
-)
-
-include_files = [
- "include/glog/log_severity.h",
- "include/glog/logging.h",
- "include/glog/raw_logging.h",
- "include/glog/stl_logging.h",
- "include/glog/vlog_is_on.h",
-]
-
-lib_files = [
- "lib/libglog.a",
-]
-
-common_script = [
- 'export UNWIND_DIR=$$(pwd)/$(GENDIR)/external/org_nongnu_libunwind',
- 'echo $$UNWIND_DIR',
- 'export INSTALL_DIR=$$(pwd)/$(@D)',
- 'export TMP_DIR=$$(mktemp -d -t glog.XXXXX)',
- 'mkdir -p $$TMP_DIR',
- 'cp -R $$(pwd)/external/com_github_google_glog/* $$TMP_DIR',
- 'cd $$TMP_DIR',
-]
-
-mac_script = "\n".join(common_script + [
- './configure --prefix=$$INSTALL_DIR --enable-shared=no',
- 'make install',
- 'rm -rf $$TMP_DIR',
-])
-
-linux_script = "\n".join(common_script + [
- 'export VAR_LIBS="-Wl,--rpath -Wl,$$UNWIND_DIR/lib -L$$UNWIND_DIR/lib"',
- 'export VAR_INCL="-I$$UNWIND_DIR/include"',
- 'export VAR_LD="-L$$UNWIND_DIR/lib"',
- 'autoreconf -f -i',
- './configure --prefix=$$INSTALL_DIR --enable-shared=no LIBS="$$VAR_LIBS"
CPPFLAGS="$$VAR_INCL" LDFLAGS="$$VAR_LD"',
- 'make install LIBS="$$VAR_LIBS" CPPFLAGS="$$VAR_INCL" LDFLAGS="$$VAR_LD"',
- 'rm -rf $$TMP_DIR',
-])
-
-genrule(
- name = "glog-srcs",
- srcs = select({
- ":darwin": [],
- "//conditions:default":
["@org_apache_heron//third_party/libunwind:libunwind-files"]
- }),
- outs = include_files + lib_files,
- cmd = select({
- ":darwin": mac_script,
- "//conditions:default": linux_script,
- }),
-)
-
-cc_library(
- name = "glog",
- srcs = lib_files,
- hdrs = include_files,
- includes = [
- "include",
- ],
- linkstatic = 1,
-)
-
-filegroup(
- name = "glog-files",
- srcs = include_files + lib_files
-)
