Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases

Conflicts:
	var/spack/repos/builtin/packages/swiftsim/package.py

3 files changed, 16 insertions, 15 deletions

diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst
index dbad0a9f6d..50a161a175 100644
--- a/lib/spack/docs/basic_usage.rst
+++ b/lib/spack/docs/basic_usage.rst
@@ -183,7 +183,7 @@ To uninstall a package and every package that depends on it, you may give the
 
    spack uninstall --dependents mpich
 
-will display a list of all the packages that depends on `mpich` and, upon confirmation,
+will display a list of all the packages that depend on `mpich` and, upon confirmation,
 will uninstall them in the right order.
 
 A line like
@@ -543,11 +543,12 @@ More formally, a spec consists of the following pieces:
 * ``+`` or ``-`` or ``~`` Optional variant specifiers (``+debug``,
   ``-qt``, or ``~qt``) for boolean variants
 * ``name=<value>`` Optional variant specifiers that are not restricted to
-boolean variants
+  boolean variants
 * ``name=<value>`` Optional compiler flag specifiers. Valid flag names are
-``cflags``, ``cxxflags``, ``fflags``, ``cppflags``, ``ldflags``, and ``ldlibs``.
+  ``cflags``, ``cxxflags``, ``fflags``, ``cppflags``, ``ldflags``, and ``ldlibs``.
 * ``target=<value> os=<value>`` Optional architecture specifier 
-(``target=haswell os=CNL10``) * ``^`` Dependency specs (``^callpath@1.1``)
+  (``target=haswell os=CNL10``)
+* ``^`` Dependency specs (``^callpath@1.1``)
 
 There are two things to notice here.  The first is that specs are
 recursively defined.  That is, each dependency after ``^`` is a spec
diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst
index a0d0feabbd..6bafaecc7d 100644
--- a/lib/spack/docs/packaging_guide.rst
+++ b/lib/spack/docs/packaging_guide.rst
@@ -2627,14 +2627,14 @@ Spack packages with variants similar to already-existing Spack
 packages should use the same name for their variants.  Standard
 variant names are:
 
-======= ======== ========================
-Name    Default   Description
-------- -------- ------------------------
-shared   True     Build shared libraries
-static            Build static libraries
-mpi               Use MPI
-python            Build Python extension
-------- -------- ------------------------
+  ======= ======== ========================
+  Name    Default   Description
+  ======= ======== ========================
+  shared   True     Build shared libraries
+  static            Build static libraries
+  mpi               Use MPI
+  python            Build Python extension
+  ======= ======== ========================
 
 If specified in this table, the corresponding default should be used
 when declaring a variant.
diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py
index 18c748e483..c9fa687b74 100644
--- a/lib/spack/spack/cmd/create.py
+++ b/lib/spack/spack/cmd/create.py
@@ -142,9 +142,9 @@ class ConfigureGuesser(object):
         # Build dependencies and extensions
         dependenciesDict = {
             'autotools': "# depends_on('foo')",
-            'cmake':     "depends_on('cmake')",
-            'scons':     "depends_on('scons')",
-            'python':    "extends('python')",
+            'cmake':     "depends_on('cmake', type='build')",
+            'scons':     "depends_on('scons', type='build')",
+            'python':    "extends('python', type=nolink)",
             'R':         "extends('R')",
             'unknown':   "# depends_on('foo')"
         }