You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2015/02/10 22:21:44 UTC
mesos git commit: Disabled installing module libraries.
Repository: mesos
Updated Branches:
refs/heads/master 82ad111cc -> 6936a6d76
Disabled installing module libraries.
Module libraries (libtestisolator, libtestauthentication, libtesthook,
and libexamplemodule) are needed for Mesos test suite only.
Review: https://reviews.apache.org/r/29607
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6936a6d7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6936a6d7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6936a6d7
Branch: refs/heads/master
Commit: 6936a6d76cb1833bc38eecb561d10ca744fd8c19
Parents: 82ad111
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Tue Feb 10 12:44:47 2015 -0800
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Tue Feb 10 12:44:47 2015 -0800
----------------------------------------------------------------------
src/Makefile.am | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6936a6d7/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index fae36ac..39ce858 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1264,32 +1264,40 @@ active_user_test_helper_LDADD = libmesos.la
check_PROGRAMS += mesos-tests
+# LDFLAGS to be used for the module libraries.
+# We need to build the module libraries for running the test suite but don't
+# need to install them. The 'noinst_' prefix ensures that these libraries will
+# not be installed. However, it also skips building the shared libraries. The
+# workaround is to use '-rpath /nowhere' to force libtool to build the shared
+# library.
+MESOS_MODULE_LDFLAGS = -release $(PACKAGE_VERSION) -shared -rpath /nowhere
+
# Library containing an example module.
-lib_LTLIBRARIES += libexamplemodule.la
+noinst_LTLIBRARIES += libexamplemodule.la
libexamplemodule_la_SOURCES = examples/example_module_impl.cpp
libexamplemodule_la_CPPFLAGS = $(MESOS_CPPFLAGS)
-libexamplemodule_la_LDFLAGS = -release $(PACKAGE_VERSION) -shared
-
-# Library containing test CPU and memory isolator modules.
-lib_LTLIBRARIES += libtestisolator.la
-libtestisolator_la_SOURCES = examples/test_isolator_module.cpp
-libtestisolator_la_CPPFLAGS = $(MESOS_CPPFLAGS)
-libtestisolator_la_LDFLAGS = -release $(PACKAGE_VERSION) -shared
+libexamplemodule_la_LDFLAGS = $(MESOS_MODULE_LDFLAGS)
# Library containing the test CRAM-MD5 authentication modules.
# TODO(tillt): Add cyrus-sasl2 dependency while removing it from libmesos.
# TODO(tillt): Enable optional building of this module library.
# TODO(tillt): Make this module library installable. See MESOS-1940.
-lib_LTLIBRARIES += libtestauthentication.la
+noinst_LTLIBRARIES += libtestauthentication.la
libtestauthentication_la_SOURCES = examples/test_authentication_modules.cpp
libtestauthentication_la_CPPFLAGS = $(MESOS_CPPFLAGS)
-libtestauthentication_la_LDFLAGS = -release $(PACKAGE_VERSION) -shared
+libtestauthentication_la_LDFLAGS = $(MESOS_MODULE_LDFLAGS)
# Library containing test Hook module.
-lib_LTLIBRARIES += libtesthook.la
+noinst_LTLIBRARIES += libtesthook.la
libtesthook_la_SOURCES = examples/test_hook_module.cpp
libtesthook_la_CPPFLAGS = $(MESOS_CPPFLAGS)
-libtesthook_la_LDFLAGS = -release $(PACKAGE_VERSION) -shared
+libtesthook_la_LDFLAGS = $(MESOS_MODULE_LDFLAGS)
+
+# Library containing test CPU and memory isolator modules.
+noinst_LTLIBRARIES += libtestisolator.la
+libtestisolator_la_SOURCES = examples/test_isolator_module.cpp
+libtestisolator_la_CPPFLAGS = $(MESOS_CPPFLAGS)
+libtestisolator_la_LDFLAGS = $(MESOS_MODULE_LDFLAGS)
mesos_tests_SOURCES = \
tests/attributes_tests.cpp \