You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2013/01/31 06:09:40 UTC
svn commit: r1440854 - in /incubator/mesos/trunk: src/Makefile.am
src/python/setup.py.in third_party/Makefile.am
third_party/gperftools-2.0.tar.gz
third_party/libprocess/third_party/Makefile.am third_party/versions.am
Author: benh
Date: Thu Jan 31 05:09:39 2013
New Revision: 1440854
URL: http://svn.apache.org/viewvc?rev=1440854&view=rev
Log:
Added libprofiler.a to the Python module objects and removed
gperftools from mesos/third_party.
From: Ben Mahler <be...@gmail.com>
Review: https://reviews.apache.org/r/9020
Removed:
incubator/mesos/trunk/third_party/gperftools-2.0.tar.gz
Modified:
incubator/mesos/trunk/src/Makefile.am
incubator/mesos/trunk/src/python/setup.py.in
incubator/mesos/trunk/third_party/Makefile.am
incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am
incubator/mesos/trunk/third_party/versions.am
Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1440854&r1=1440853&r2=1440854&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Thu Jan 31 05:09:39 2013
@@ -28,7 +28,6 @@ DISTRIBUTE = third_party/distribute-$(DI
PROTOBUF = third_party/protobuf-$(PROTOBUF_VERSION)
GLOG = third_party/glog-$(GLOG_VERSION)
GMOCK = third_party/gmock-$(GMOCK_VERSION)
-GPERFTOOLS = third_party/gperftools-$(GPERFTOOLS_VERSION)
GTEST = $(GMOCK)/gtest
LEVELDB = third_party/leveldb
ZOOKEEPER = third_party/zookeeper-$(ZOOKEEPER_VERSION)/src/c
@@ -306,7 +305,6 @@ libmesos_la_LIBADD = libmesos_no_third_p
# possible.)
libmesos_la_LIBADD += ../$(PROTOBUF)/src/libprotobuf.la
libmesos_la_LIBADD += ../$(GLOG)/libglog.la
-libmesos_la_LIBADD += ../$(GPERFTOOLS)/libprofiler.la
# We need to directly include the leveldb library in order to avoid
# the installed libmesos.la file to include leveldb in
Modified: incubator/mesos/trunk/src/python/setup.py.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/python/setup.py.in?rev=1440854&r1=1440853&r2=1440854&view=diff
==============================================================================
--- incubator/mesos/trunk/src/python/setup.py.in (original)
+++ incubator/mesos/trunk/src/python/setup.py.in Thu Jan 31 05:09:39 2013
@@ -25,12 +25,13 @@ leveldb = os.path.join('third_party', 'l
zookeeper = os.path.join('third_party', 'zookeeper-3.3.4', 'src', 'c')
libprocess = os.path.join('third_party', 'libprocess')
-# Even though a statically compiled libprocess should include libev,
-# before installation this isn't the case, so while a libtool managed
-# build will correctly pull in libev when building the final result,
-# we need to explicitely include libev here (or more precisely, down
-# where we actually include libev.a).
+# Even though a statically compiled libprocess should include libev and
+# gperftools, before installation this isn't the case, so while a libtool
+# managed build will correctly pull in these libraries when building the
+# final result, we need to explicitly include them here
+# (or more precisely, down where we actually include libev.a and libprofiler.a).
libev = os.path.join(libprocess, 'third_party', 'libev-3.8')
+gperftools = os.path.join(libprocess, 'third_party', 'gperftools-2.0')
# We need to execute from the same directory as this script.
os.chdir(os.path.abspath(os.path.dirname(__file__)))
@@ -75,6 +76,7 @@ EXTRA_OBJECTS = [
os.path.join(abs_top_builddir, zookeeper, '.libs', 'libzookeeper_mt.a'),
os.path.join(abs_top_builddir, libprocess, '.libs', 'libprocess.a'),
os.path.join(abs_top_builddir, libev, '.libs', 'libev.a'),
+ os.path.join(abs_top_builddir, gperftools, '.libs', 'libprofiler.a'),
]
EXTRA_LINK_ARGS = []
Modified: incubator/mesos/trunk/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/Makefile.am?rev=1440854&r1=1440853&r2=1440854&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/Makefile.am Thu Jan 31 05:09:39 2013
@@ -37,7 +37,6 @@ BOTO = boto-$(BOTO_VERSION)
DISTRIBUTE = distribute-$(DISTRIBUTE_VERSION)
GLOG = glog-$(GLOG_VERSION)
GMOCK = gmock-$(GMOCK_VERSION)
-GPERFTOOLS = gperftools-$(GPERFTOOLS_VERSION)
GTEST = $(GMOCK)/gtest
LEVELDB = leveldb
PROTOBUF = protobuf-$(PROTOBUF_VERSION)
@@ -45,11 +44,11 @@ ZOOKEEPER = zookeeper-$(ZOOKEEPER_VERSIO
EXTRA_DIST = $(BOOST).tar.gz $(BOTO).zip $(DISTRIBUTE).tar.gz \
- $(GLOG).tar.gz $(GMOCK).tar.gz $(GPERFTOOLS).tar.gz \
- $(LEVELDB).tar.gz $(PROTOBUF).tar.gz $(ZOOKEEPER).tar.gz
+ $(GLOG).tar.gz $(GMOCK).tar.gz $(LEVELDB).tar.gz \
+ $(PROTOBUF).tar.gz $(ZOOKEEPER).tar.gz
CLEAN_EXTRACTED = $(BOOST) $(BOTO) $(DISTRIBUTE) $(GLOG) $(GMOCK) \
- $(GPERFTOOLS) $(LEVELDB) $(PROTOBUF) $(ZOOKEEPER)
+ $(LEVELDB) $(PROTOBUF) $(ZOOKEEPER)
# Convenience library for gmock/gtest.
@@ -87,10 +86,6 @@ $(GLOG)/libglog.la: $(GLOG)-stamp
$(GMOCK)/src/gmock-all.cc: $(GMOCK)-stamp
-$(GPERFTOOLS)/libprofiler.la: $(GPERFTOOLS)-stamp
- cd $(GPERFTOOLS) && ./configure $(CONFIGURE_ARGS) && \
- $(MAKE) $(AM_MAKEFLAGS)
-
$(GTEST)/src/gtest-all.cc: $(GMOCK)-stamp
# TODO(charles): Figure out PIC options in our configure.ac or create
@@ -111,7 +106,6 @@ $(ZOOKEEPER)/src/c/libzookeeper_mt.la: $
$(MAKE) $(AM_MAKEFLAGS)
THIRD_PARTY_LIBS = $(BOOST)-stamp $(GLOG)/libglog.la \
- $(GPERFTOOLS)/libprofiler.la \
$(LEVELDB)/libleveldb.a $(PROTOBUF)/src/libprotobuf.la \
$(PROTOBUF)/src/protoc
Modified: incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am?rev=1440854&r1=1440853&r2=1440854&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am Thu Jan 31 05:09:39 2013
@@ -71,7 +71,7 @@ $(GLOG)/libglog.la: $(GLOG)-stamp
$(GMOCK)/src/gmock-all.cc: $(GMOCK)-stamp
$(GPERFTOOLS)/libprofiler.la: $(GPERFTOOLS)-stamp
- cd $(GPERFTOOLS) && ./configure $(CONFIGURE_ARGS) && \
+ cd $(GPERFTOOLS) && ./configure $(CONFIGURE_ARGS) && \
$(MAKE) $(AM_MAKEFLAGS)
$(GTEST)/src/gtest-all.cc: $(GMOCK)-stamp
Modified: incubator/mesos/trunk/third_party/versions.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/versions.am?rev=1440854&r1=1440853&r2=1440854&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/versions.am (original)
+++ incubator/mesos/trunk/third_party/versions.am Thu Jan 31 05:09:39 2013
@@ -24,6 +24,5 @@ BOTO_VERSION = 2.0b2
DISTRIBUTE_VERSION = 0.6.26
GLOG_VERSION = 0.3.1
GMOCK_VERSION = 1.6.0
-GPERFTOOLS_VERSION = 2.0
PROTOBUF_VERSION = 2.4.1
ZOOKEEPER_VERSION = 3.3.4