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 2012/04/19 21:38:21 UTC
svn commit: r1328089 - in /incubator/mesos/trunk: src/Makefile.am
third_party/Makefile.am
Author: benh
Date: Thu Apr 19 19:38:20 2012
New Revision: 1328089
URL: http://svn.apache.org/viewvc?rev=1328089&view=rev
Log:
Fixes for dealing with --disable-python.
Modified:
incubator/mesos/trunk/src/Makefile.am
incubator/mesos/trunk/third_party/Makefile.am
Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1328089&r1=1328088&r2=1328089&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Thu Apr 19 19:38:20 2012
@@ -48,11 +48,6 @@ pkglocalstatedir = $(localstatedir)/$(PA
# localstatedir (e.g., /usr/local/var) is for modifiable "data".
webuidir = $(pkgdatadir)
-# Used for building Python eggs.
-DISTRIBUTE_EGG_SUFFIX = $(DISTRIBUTE_VERSION)$(PYTHON_EGG_PUREPY_POSTFIX).egg
-DISTRIBUTE_EGG = \
- $(abs_top_builddir)/$(DISTRIBUTE)/dist/distribute-$(DISTRIBUTE_EGG_SUFFIX)
-
# Protocol buffer compiler.
PROTOC = ../$(PROTOBUF)/src/protoc
PROTOCFLAGS = -I$(top_srcdir)/include/mesos -I$(srcdir)
@@ -538,6 +533,22 @@ EXTRA_DIST += python/src/mesos.py \
python/native/proxy_scheduler.hpp
if HAS_PYTHON
+# Used for building Python eggs.
+DISTRIBUTE_EGG_SUFFIX = $(DISTRIBUTE_VERSION)$(PYTHON_EGG_PUREPY_POSTFIX).egg
+DISTRIBUTE_EGG = \
+ $(abs_top_builddir)/$(DISTRIBUTE)/dist/distribute-$(DISTRIBUTE_EGG_SUFFIX)
+
+# Build a protobuf Python egg.
+PROTOBUF_EGG_SUFFIX = $(PROTOBUF_VERSION)$(PYTHON_EGG_PUREPY_POSTFIX).egg
+PROTOBUF_EGG = ../$(PROTOBUF)/python/dist/protobuf-$(PROTOBUF_EGG_SUFFIX)
+
+$(PROTOBUF_EGG):
+ @echo "Building protobuf Python egg ..."
+ @cd ../$(PROTOBUF)/python && \
+ PYTHONPATH=$(DISTRIBUTE_EGG) $(PYTHON) setup.py bdist_egg
+
+CLEANFILES += $(PROTOBUF_EGG)
+
# This builds a Python egg against libmesos_no_third_party.a that is
# self-contained. It currently depends on the libraries in third_party
# being built as .a's. (If this is changed, the setup.py will need to
@@ -553,16 +564,6 @@ if HAS_PYTHON
# system versions of our dependencies (since we won't be able to
# create a standalone egg anyways).
-PROTOBUF_EGG_SUFFIX = $(PROTOBUF_VERSION)$(PYTHON_EGG_PUREPY_POSTFIX).egg
-PROTOBUF_EGG = ../$(PROTOBUF)/python/dist/protobuf-$(PROTOBUF_EGG_SUFFIX)
-
-$(PROTOBUF_EGG):
- @echo "Building protobuf Python egg ..."
- @cd ../$(PROTOBUF)/python && \
- PYTHONPATH=$(DISTRIBUTE_EGG) $(PYTHON) setup.py bdist_egg
-
-CLEANFILES += $(PROTOBUF_EGG)
-
MESOS_EGG = python/dist/mesos-$(PACKAGE_VERSION)$(PYTHON_EGG_POSTFIX).egg
$(MESOS_EGG): python/setup.py $(srcdir)/python/src/mesos.py \
Modified: incubator/mesos/trunk/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/Makefile.am?rev=1328089&r1=1328088&r2=1328089&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/Makefile.am Thu Apr 19 19:38:20 2012
@@ -72,11 +72,13 @@ BUILT_SOURCES += $(nodist_libgmock_la_SO
$(BOOST)/boost: $(BOOST)-stamp
+if HAS_PYTHON
DISTRIBUTE_EGG = \
$(DISTRIBUTE)/dist/$(DISTRIBUTE)$(PYTHON_EGG_PUREPY_POSTFIX).egg
$(DISTRIBUTE_EGG): $(DISTRIBUTE)-stamp
cd $(DISTRIBUTE) && $(PYTHON) setup.py bdist_egg
+endif
$(GLOG)/libglog.la: $(GLOG)-stamp
cd $(GLOG) && ./configure $(CONFIGURE_ARGS) && \
@@ -102,10 +104,14 @@ $(ZOOKEEPER)/src/c/libzookeeper_mt.la: $
cd $(ZOOKEEPER)/src/c && ./configure $(CONFIGURE_ARGS) && \
$(MAKE) $(AM_MAKEFLAGS)
-THIRD_PARTY_LIBS = $(BOOST)-stamp $(DISTRIBUTE_EGG) $(GLOG)/libglog.la \
- $(LEVELDB)/libleveldb.a $(PROTOBUF)/src/libprotobuf.la \
+THIRD_PARTY_LIBS = $(BOOST)-stamp $(GLOG)/libglog.la \
+ $(LEVELDB)/libleveldb.a $(PROTOBUF)/src/libprotobuf.la \
$(PROTOBUF)/src/protoc
+if HAS_PYTHON
+ THIRD_PARTY_LIBS += $(DISTRIBUTE_EGG)
+endif
+
if WITH_INCLUDED_ZOOKEEPER
THIRD_PARTY_LIBS += $(ZOOKEEPER)/src/c/libzookeeper_mt.la
else