You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ka...@apache.org on 2016/06/14 05:09:47 UTC
[1/2] mesos git commit: Added bundled zookeeper to the
module-dependencies.
Repository: mesos
Updated Branches:
refs/heads/master af474a6fa -> bcccb82a7
Added bundled zookeeper to the module-dependencies.
Modules that want to use the `State` API for storing information in
the replicated log require zookeeper client headers. With this change
the bundled zookeeper client headers will be installed along with the
Mesos libraries and headers under the Mesos installation path.
Review: https://reviews.apache.org/r/48594/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a26ec3c1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a26ec3c1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a26ec3c1
Branch: refs/heads/master
Commit: a26ec3c1b9cfd2e85f3df08944d3e2a839f4eb9e
Parents: af474a6
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Tue Jun 14 01:06:22 2016 -0400
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Tue Jun 14 01:06:22 2016 -0400
----------------------------------------------------------------------
3rdparty/Makefile.am | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a26ec3c1/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index fb4a37d..651e965 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -302,3 +302,7 @@ if WITH_BUNDLED_PROTOBUF
cd $(PROTOBUF) && \
$(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(INSTALLDIR) install
endif
+if WITH_BUNDLED_ZOOKEEPER
+ cd $(ZOOKEEPER)/src/c && \
+ $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(INSTALLDIR) install
+endif
[2/2] mesos git commit: Removed conditional for of setting
`--prefix=/`.
Posted by ka...@apache.org.
Removed conditional for of setting `--prefix=/`.
For bundled 3rdparty packages the `--prefix` flag should always be set
to `/`, else the 3rdparty installation path might append the
$MESOS_INSTALL to the installation path.
Review: https://reviews.apache.org/r/48612/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bcccb82a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bcccb82a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bcccb82a
Branch: refs/heads/master
Commit: bcccb82a7b2643efb0928797f429f1b0b64aecc4
Parents: a26ec3c
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Tue Jun 14 01:06:36 2016 -0400
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Tue Jun 14 01:06:36 2016 -0400
----------------------------------------------------------------------
3rdparty/Makefile.am | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bcccb82a/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 651e965..485ed55 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -30,14 +30,12 @@ SUBDIRS = . stout libprocess
# '--srcdir=...' when configuring.
CONFIGURE_ARGS = @CONFIGURE_ARGS@ --enable-shared=no --with-pic --srcdir=.
-if INSTALL_MODULE_DEPENDENCIES
# The reason we use '/' prefix is to allow ourselves to install these packages
# in build/3rdparty directory as well. To do that, we can simply call
# `make install DESTDIR=/path/to/builddir/ install`
# Similarly, when doing system-wide installation, we can do:
# `make install DESTDIR=${MESOS-PREFIX}/lib/mesos/3rdparty install`
CONFIGURE_ARGS += --prefix=/
-endif
# Directory where bundled 3rdparty module dependencies are installed.
pkg3rdpartydir = $(pkglibdir)/3rdparty