You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ka...@apache.org on 2018/04/01 06:49:12 UTC
[incubator-heron] branch karthik/binaryout updated: fix ubuntu
compilation
This is an automated email from the ASF dual-hosted git repository.
karthikz pushed a commit to branch karthik/binaryout
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/karthik/binaryout by this push:
new 3b08101 fix ubuntu compilation
3b08101 is described below
commit 3b08101ca4225cfc402e5b4f3b7005786d86a64d
Author: Karthik Ramasamy <ka...@streaml.io>
AuthorDate: Sat Mar 31 23:48:57 2018 -0700
fix ubuntu compilation
---
third_party/glog/glog.BUILD | 3 +--
third_party/gperftools/gperftools.BUILD | 4 +---
third_party/libunwind/BUILD | 2 ++
third_party/libunwind/libunwind.BUILD | 10 +++++-----
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/third_party/glog/glog.BUILD b/third_party/glog/glog.BUILD
index 06baa96..7a5507a 100644
--- a/third_party/glog/glog.BUILD
+++ b/third_party/glog/glog.BUILD
@@ -31,8 +31,7 @@ lib_files = [
]
common_script = [
- 'echo $$(pwd)',
- 'export UNWIND_DIR=$$(pwd)/$(GENDIR)/third_party/libunwind',
+ '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)',
diff --git a/third_party/gperftools/gperftools.BUILD b/third_party/gperftools/gperftools.BUILD
index e723f6b..574e1d6 100644
--- a/third_party/gperftools/gperftools.BUILD
+++ b/third_party/gperftools/gperftools.BUILD
@@ -19,10 +19,8 @@ config_setting(
)
common_script = [
- "echo $$(pwd)",
- "export UNWIND_DIR=$$(pwd)/$(GENDIR)/third_party/libunwind",
+ "export UNWIND_DIR=$$(pwd)/$(GENDIR)/external/org_nongnu_libunwind",
"echo $$UNWIND_DIR",
- "ls -l $$UNWIND_DIR",
"export INSTALL_DIR=$$(pwd)/$(@D)",
"export TMP_DIR=$$(mktemp -d -t gperftools.XXXXX)",
"mkdir -p $$TMP_DIR",
diff --git a/third_party/libunwind/BUILD b/third_party/libunwind/BUILD
index 6cbb232..9c73b70 100644
--- a/third_party/libunwind/BUILD
+++ b/third_party/libunwind/BUILD
@@ -1,3 +1,5 @@
+package(default_visibility = ["//visibility:public"])
+
exports_files([
"libunwind-1.1-cache.patch",
"libunwind-1.1-config.patch",
diff --git a/third_party/libunwind/libunwind.BUILD b/third_party/libunwind/libunwind.BUILD
index 9919567..8eb51d2 100644
--- a/third_party/libunwind/libunwind.BUILD
+++ b/third_party/libunwind/libunwind.BUILD
@@ -37,15 +37,15 @@ genrule(
],
outs = out_files,
cmd = "\n".join([
- "export SOURCE_DIR=$$(pwd)/third_party/libunwind",
+ "export SOURCE_DIR=$$(pwd)",
"export INSTALL_DIR=$$(pwd)/$(@D)",
"export TMP_DIR=$$(mktemp -d -t libunwind.XXXXX)",
"mkdir -p $$TMP_DIR",
- "cp -R $$(pwd)/external/org_savannah_libunwind/* $$TMP_DIR",
+ "cp -LR $$(pwd)/external/org_savannah_libunwind/* $$TMP_DIR",
"cd $$TMP_DIR",
- "patch -p1 < $(location @org_apache_heron//third_party/libunwind:libunwind-1.1-lzma-link.patch)",
- "patch -p0 < $(location @org_apache_heron//third_party/libunwind:libunwind-1.1-config.patch)",
- "patch -p0 < $(location @org_apache_heron//third_party/libunwind:libunwind-1.1-cache.patch)",
+ "patch -p1 < $$SOURCE_DIR/$(location @org_apache_heron//third_party/libunwind:libunwind-1.1-lzma-link.patch)",
+ "patch -p0 < $$SOURCE_DIR/$(location @org_apache_heron//third_party/libunwind:libunwind-1.1-config.patch)",
+ "patch -p0 < $$SOURCE_DIR/$(location @org_apache_heron//third_party/libunwind:libunwind-1.1-cache.patch)",
"./configure --prefix=$$INSTALL_DIR --enable-shared=no --disable-minidebuginfo",
"make install",
"rm -rf $$TMP_DIR",
--
To stop receiving notification emails like this one, please contact
karthikz@apache.org.