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 df64466 fix libunwind dependency df64466 is described below commit df6446609c63179ee27ce79017050043de177264 Author: Karthik Ramasamy <kart...@streaml.io> AuthorDate: Sat Mar 31 22:52:36 2018 -0700 fix libunwind dependency --- WORKSPACE | 2 ++ third_party/glog/glog.BUILD | 4 ++-- third_party/gperftools/gperftools.BUILD | 4 +++- third_party/libunwind/BUILD | 11 +++++++++++ third_party/libunwind/libunwind.BUILD | 18 +++++++++++++++--- 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index a619189..b040e43 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,3 +1,5 @@ +workspace(name = "org_apache_heron") + # versions shared across artifacts that should be upgraded together aws_version = "1.11.58" curator_version = "2.9.0" diff --git a/third_party/glog/glog.BUILD b/third_party/glog/glog.BUILD index f2c4b42..06baa96 100644 --- a/third_party/glog/glog.BUILD +++ b/third_party/glog/glog.BUILD @@ -58,11 +58,11 @@ linux_script = "\n".join(common_script + [ genrule( name = "glog-srcs", - outs = include_files + lib_files, srcs = select({ ":darwin": [], - "//conditions:default": ["//third_party/libunwind:libunwind-files"] + "//conditions:default": ["@org_apache_heron//third_party/libunwind:libunwind-files"] }), + outs = include_files + lib_files, cmd = select({ ":darwin": mac_script, "//conditions:default": linux_script, diff --git a/third_party/gperftools/gperftools.BUILD b/third_party/gperftools/gperftools.BUILD index 0d84397..e723f6b 100644 --- a/third_party/gperftools/gperftools.BUILD +++ b/third_party/gperftools/gperftools.BUILD @@ -21,6 +21,8 @@ config_setting( common_script = [ "echo $$(pwd)", "export UNWIND_DIR=$$(pwd)/$(GENDIR)/third_party/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", @@ -44,7 +46,7 @@ genrule( name = "gperftools-srcs", srcs = select({ ":darwin": [], - "//conditions:default": ["//third_party/libunwind:libunwind-files"] + "//conditions:default": ["@org_apache_heron//third_party/libunwind:libunwind-files"] }), outs = [ "bin/pprof", diff --git a/third_party/libunwind/BUILD b/third_party/libunwind/BUILD new file mode 100644 index 0000000..6cbb232 --- /dev/null +++ b/third_party/libunwind/BUILD @@ -0,0 +1,11 @@ +exports_files([ + "libunwind-1.1-cache.patch", + "libunwind-1.1-config.patch", + "libunwind-1.1-lzma-link.patch", + "libunwind.BUILD", +]) + +filegroup( + name = "libunwind-files", + srcs = ["@org_nongnu_libunwind//:libunwind-files"], +) diff --git a/third_party/libunwind/libunwind.BUILD b/third_party/libunwind/libunwind.BUILD index 11dbbef..9919567 100644 --- a/third_party/libunwind/libunwind.BUILD +++ b/third_party/libunwind/libunwind.BUILD @@ -21,8 +21,20 @@ out_files = [ "lib/libunwind-x86_64.a", ] +exports_files([ + "libunwind-1.1-cache.patch", + "libunwind-1.1-config.patch", + "libunwind-1.1-lzma-link.patch", + "libunwind.BUILD", +]) + genrule( name = "libunwind-srcs", + srcs = [ + "@org_apache_heron//third_party/libunwind:libunwind-1.1-cache.patch", + "@org_apache_heron//third_party/libunwind:libunwind-1.1-config.patch", + "@org_apache_heron//third_party/libunwind:libunwind-1.1-lzma-link.patch", + ], outs = out_files, cmd = "\n".join([ "export SOURCE_DIR=$$(pwd)/third_party/libunwind", @@ -31,9 +43,9 @@ genrule( "mkdir -p $$TMP_DIR", "cp -R $$(pwd)/external/org_savannah_libunwind/* $$TMP_DIR", "cd $$TMP_DIR", - "patch -p1 < $$(SOURCE_DIR)/" + lzma_patch, - "patch -p0 < $$(SOURCE_DIR)/" + config_patch, - "patch -p0 < $$(SOURCE_DIR)/" + cache_patch, + "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)", "./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 karth...@apache.org.