You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2020/04/05 01:33:43 UTC
[incubator-heron] branch nicknezis/bazel-2 updated (c0cf358 ->
39390d9)
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a change to branch nicknezis/bazel-2
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git.
from c0cf358 Removing Zookeeper autoreconf
new 76421e4 Added patch file to make Zookeeper compile on Ubuntu 18.04
new 02a38c0 Adding missing packages
new 36101df Removing duplicate line
new 39390d9 Updated libunwind
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
WORKSPACE | 11 ++++++-----
docker/compile/Dockerfile.ubuntu18.04 | 3 ++-
third_party/zookeeper/{zookeeper.BUILD => BUILD} | 1 +
third_party/zookeeper/pkgconfig.patch | 12 ++++++++++++
4 files changed, 21 insertions(+), 6 deletions(-)
rename third_party/zookeeper/{zookeeper.BUILD => BUILD} (98%)
create mode 100644 third_party/zookeeper/pkgconfig.patch
[incubator-heron] 03/04: Removing duplicate line
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch nicknezis/bazel-2
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 36101df82ff02d796ae7d19229236facdff03f39
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Sat Apr 4 21:26:45 2020 -0400
Removing duplicate line
---
WORKSPACE | 1 -
1 file changed, 1 deletion(-)
diff --git a/WORKSPACE b/WORKSPACE
index 31cab18..670e620 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -74,7 +74,6 @@ maven_install(
"com.google.apis:google-api-services-storage:v1-rev108-1.22.0",
"org.apache.pulsar:pulsar-client:jar:shaded:1.19.0-incubating",
"io.kubernetes:client-java:7.0.0",
- "com.hashicorp.nomad:nomad-sdk:0.7.0",
"com.microsoft.dhalion:dhalion:0.2.3",
"org.objenesis:objenesis:2.1",
"org.ow2.asm:asm-all:5.1",
[incubator-heron] 01/04: Added patch file to make Zookeeper compile
on Ubuntu 18.04
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch nicknezis/bazel-2
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 76421e47a90dd80cb4366b97829b1f736add0790
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Sat Apr 4 21:15:45 2020 -0400
Added patch file to make Zookeeper compile on Ubuntu 18.04
---
WORKSPACE | 4 +++-
third_party/zookeeper/{zookeeper.BUILD => BUILD} | 1 +
third_party/zookeeper/pkgconfig.patch | 12 ++++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/WORKSPACE b/WORKSPACE
index f3bacde..31cab18 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -248,8 +248,10 @@ http_archive(
name = "org_apache_zookeeper",
urls = ["https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz"],
strip_prefix = "zookeeper-3.4.14",
- build_file = "@//:third_party/zookeeper/zookeeper.BUILD",
+ build_file = "@//:third_party/zookeeper/BUILD",
sha256 = "b14f7a0fece8bd34c7fffa46039e563ac5367607c612517aa7bd37306afbd1cd",
+ patches = ["//third_party/zookeeper:pkgconfig.patch"],
+ patch_args = ["-p2"],
)
http_archive(
diff --git a/third_party/zookeeper/zookeeper.BUILD b/third_party/zookeeper/BUILD
similarity index 98%
rename from third_party/zookeeper/zookeeper.BUILD
rename to third_party/zookeeper/BUILD
index 008cb5b..d9f06ee 100644
--- a/third_party/zookeeper/zookeeper.BUILD
+++ b/third_party/zookeeper/BUILD
@@ -29,6 +29,7 @@ genrule(
"mkdir -p $$TMP_DIR",
"cp -R $$(pwd)/external/org_apache_zookeeper/* $$TMP_DIR",
"cd $$TMP_DIR/zookeeper-client/zookeeper-client-c",
+ "autoreconf -if",
"./configure --prefix=$$INSTALL_DIR --enable-shared=no",
"make install",
"rm -rf $$TMP_DIR",
diff --git a/third_party/zookeeper/pkgconfig.patch b/third_party/zookeeper/pkgconfig.patch
new file mode 100644
index 0000000..472fe6c
--- /dev/null
+++ b/third_party/zookeeper/pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -Naur /tmp/zookeeper-client/zookeeper-client-c/configure.ac /tmp/zookeeper-client/zookeeper-client-c/configure.ac
+--- /tmp/zookeeper-client/zookeeper-client-c/configure.ac 2019-03-06 16:50:47.000000000 +0000
++++ /tmp/zookeeper-client/zookeeper-client-c/configure.ac 2020-04-04 23:44:40.442252000 +0000
+@@ -34,7 +34,7 @@
+ CPPUNIT_INCLUDE=
+ CPPUNIT_LIBS=
+ else
+- AM_PATH_CPPUNIT(1.10.2)
++ PKG_CHECK_MODULES([CPPUNIT], [cppunit >= 1.10.2])
+ fi
+
+ if test "$CALLER" = "ANT" ; then
[incubator-heron] 02/04: Adding missing packages
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch nicknezis/bazel-2
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 02a38c0349dea55d33cfc4ad5bcd893f16594800
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Sat Apr 4 21:16:31 2020 -0400
Adding missing packages
---
docker/compile/Dockerfile.ubuntu18.04 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docker/compile/Dockerfile.ubuntu18.04 b/docker/compile/Dockerfile.ubuntu18.04
index bac758f..c55a069 100644
--- a/docker/compile/Dockerfile.ubuntu18.04
+++ b/docker/compile/Dockerfile.ubuntu18.04
@@ -27,9 +27,10 @@ RUN apt-get update && apt-get -y install \
automake \
libtool-bin \
libunwind8 \
+ libcppunit-dev \
patch \
python-dev \
- python3-dev \
+ pkg-config \
wget \
zip \
virtualenv \
[incubator-heron] 04/04: Updated libunwind
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch nicknezis/bazel-2
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 39390d95c1e4f17b0d94caf322cef724bd052e0c
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Sat Apr 4 21:27:26 2020 -0400
Updated libunwind
---
WORKSPACE | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/WORKSPACE b/WORKSPACE
index 670e620..f873c35 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -237,10 +237,10 @@ http_archive(
http_archive(
name = "org_nongnu_libunwind",
- urls = ["https://download.savannah.nongnu.org/releases/libunwind/libunwind-1.1.tar.gz"],
- strip_prefix = "libunwind-1.1",
+ urls = ["https://github.com/libunwind/libunwind/releases/download/v1.3.2/libunwind-1.3.2.tar.gz"],
+ strip_prefix = "libunwind-1.3.2",
build_file = "@//:third_party/libunwind/libunwind.BUILD",
- sha256 = "9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a",
+ sha256 = "0a4b5a78d8c0418dfa610245f75fa03ad45d8e5e4cc091915d2dbed34c01178e",
)
http_archive(