summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-06-26 22:37:43 -0700
committerGitHub <noreply@github.com>2016-06-26 22:37:43 -0700
commit8f28df1d1486800d52ae394af4007785df50a02d (patch)
tree80bf7bbef9738475fe0d72449f2fcc1ce056e223
parent8b35940857d3ed5a3361c6097603cfd166c71da5 (diff)
parentf29b55957ac00b440a7c8b0f609ee5380c32d5db (diff)
downloadspack-8f28df1d1486800d52ae394af4007785df50a02d.tar.gz
spack-8f28df1d1486800d52ae394af4007785df50a02d.tar.bz2
spack-8f28df1d1486800d52ae394af4007785df50a02d.tar.xz
spack-8f28df1d1486800d52ae394af4007785df50a02d.zip
Merge pull request #1094 from epfl-scitas/documentation/remove_packages_yaml_inconsistencies
packages.yaml : removed references to a never implemented feature
-rw-r--r--lib/spack/docs/configuration.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/spack/docs/configuration.rst b/lib/spack/docs/configuration.rst
index c613071c65..a6f876b2aa 100644
--- a/lib/spack/docs/configuration.rst
+++ b/lib/spack/docs/configuration.rst
@@ -140,7 +140,6 @@ Here's an example packages.yaml file that sets preferred packages:
packages:
dyninst:
compiler: [gcc@4.9]
- variants: +debug
gperftools:
version: [2.2, 2.4, 2.3]
all:
@@ -150,8 +149,8 @@ Here's an example packages.yaml file that sets preferred packages:
At a high level, this example is specifying how packages should be
-concretized. The dyninst package should prefer using gcc 4.9 and
-be built with debug options. The gperftools package should prefer version
+concretized. The dyninst package should prefer using gcc 4.9.
+The gperftools package should prefer version
2.2 over 2.4. Every package on the system should prefer mvapich for
its MPI and gcc 4.4.7 (except for Dyninst, which overrides this by preferring gcc 4.9).
These options are used to fill in implicit defaults. Any of them can be overwritten
@@ -160,7 +159,7 @@ on the command line if explicitly requested.
Each packages.yaml file begins with the string ``packages:`` and
package names are specified on the next level. The special string ``all``
applies settings to each package. Underneath each package name is
-one or more components: ``compiler``, ``variants``, ``version``,
+one or more components: ``compiler``, ``version``,
or ``providers``. Each component has an ordered list of spec
``constraints``, with earlier entries in the list being preferred over
later entries.