You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by kl...@apache.org on 2018/07/04 14:30:55 UTC
mesos git commit: Updated configure.ac and Makefile.am to use
`$PYTHON` not `python`.
Repository: mesos
Updated Branches:
refs/heads/master f9bb153f0 -> bf69856f2
Updated configure.ac and Makefile.am to use `$PYTHON` not `python`.
This ensures that we use Python 2 even if the default Python
installed in the path under `python` is Python 3.
Previously, even when explicitly setting PYTHON_VERSION or PYTHON to a
version of Python 2.6+, configuration would succeed, but compilation
would fail. This commit fixes that.
Review: https://reviews.apache.org/r/67487/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bf69856f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bf69856f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bf69856f
Branch: refs/heads/master
Commit: bf69856f241590b652485e012580dbbdb5e11674
Parents: f9bb153
Author: Armand Grillet <ag...@mesosphere.io>
Authored: Wed Jul 4 16:06:36 2018 +0200
Committer: Kevin Klues <kl...@gmail.com>
Committed: Wed Jul 4 16:12:04 2018 +0200
----------------------------------------------------------------------
configure.ac | 4 ++--
src/Makefile.am | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bf69856f/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ae43843..66cc28a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2365,7 +2365,7 @@ variable set to a version of Python greater than 3.0.
fi
if test "x$enable_python" = "xyes"; then
- # Next we ensure we have the Python development libraries.
+ # Next we ensure we have the Python development libraries for Python 2.
AX_PYTHON_DEVEL([>= '2.6'])
# Ensure that we can build a native Python egg linking against a
@@ -2474,7 +2474,7 @@ There are two possible workarounds for this issue:
$PYTHON -c "import mesos; mesos._mesos" &> /dev/null
if test $? = 0; then
- pymodulelocation=`python -c \
+ pymodulelocation=`$PYTHON -c \
"import mesos; import os; print os.path.dirname(mesos.__path__[[0]])" \
2> /dev/null`
fi
http://git-wip-us.apache.org/repos/asf/mesos/blob/bf69856f/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index de80820..3ac1e1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1768,11 +1768,12 @@ MESOS_CLI_HIDDEN_IMPORTS = \
mesos: $(shell find $(MESOS_CLI_SRCDIR) | grep -v .virtualenv)
@echo "Building the CLI ..."
VIRTUALENV_DIRECTORY=$(builddir)/.virtualenv \
+ PYTHON=$(PYTHON) \
$(MESOS_CLI_SRCDIR)/bootstrap && \
echo "VERSION = \"$(PACKAGE_VERSION)\"" \
> $(MESOS_CLI_BUILDDIR)/version.py && \
source $(builddir)/.virtualenv/bin/activate && \
- python -m PyInstaller -p $(MESOS_CLI_SRCDIR)/lib\
+ pyinstaller -p $(MESOS_CLI_SRCDIR)/lib \
$(MESOS_CLI_HIDDEN_IMPORTS) \
--specpath $(MESOS_CLI_BUILDDIR) \
--workpath $(MESOS_CLI_BUILDDIR)/work \