diff --git a/added-target-and-os-calls-to-output-of-spack-spec-co.patch b/added-target-and-os-calls-to-output-of-spack-spec-co.patch new file mode 100644 index 0000000..c8f4d82 --- /dev/null +++ b/added-target-and-os-calls-to-output-of-spack-spec-co.patch @@ -0,0 +1,84 @@ +From 239be0609302d296e6d4d275e800e505466011ab Mon Sep 17 00:00:00 2001 +From: Christian Goll +Date: Fri, 11 Dec 2020 15:37:48 +0100 +Subject: [PATCH 2/2] added target and os calls to output of spack spec + commands + +--- + lib/spack/docs/developer_guide.rst | 2 +- + lib/spack/docs/getting_started.rst | 2 +- + lib/spack/docs/packaging_guide.rst | 6 +++--- + lib/spack/docs/workflows.rst | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/lib/spack/docs/developer_guide.rst b/lib/spack/docs/developer_guide.rst +index 7fd4d1ec6..e2c7689ad 100644 +--- a/lib/spack/docs/developer_guide.rst ++++ b/lib/spack/docs/developer_guide.rst +@@ -488,7 +488,7 @@ supply ``--profile`` to Spack on the command line, before any subcommands. + + ``spack --profile`` output looks like this: + +-.. command-output:: spack --profile graph hdf5 ++.. command-output:: spack --profile graph hdf5 os=SUSE target=x86_64 + :ellipsis: 25 + + The bottom of the output shows the top most time consuming functions, +diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst +index f1df0343b..b32d82c37 100644 +--- a/lib/spack/docs/getting_started.rst ++++ b/lib/spack/docs/getting_started.rst +@@ -83,7 +83,7 @@ Check Installation + With Spack installed, you should be able to run some basic Spack + commands. For example: + +-.. command-output:: spack spec netcdf-c ++.. command-output:: spack spec netcdf-c target=x86_64 os=SUSE + + In theory, Spack doesn't need any additional installation; just + download and run! But in real life, additional steps are usually +diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst +index 66caddeb0..20bffef35 100644 +--- a/lib/spack/docs/packaging_guide.rst ++++ b/lib/spack/docs/packaging_guide.rst +@@ -4540,13 +4540,13 @@ Spack provides the ``spack graph`` command for graphing dependencies. + The command by default generates an ASCII rendering of a spec's + dependency graph. For example: + +-.. command-output:: spack graph hdf5 ++.. command-output:: spack graph hdf5 target=x86_64 os=SUSE + + At the top is the root package in the DAG, with dependency edges emerging + from it. On a color terminal, the edges are colored by which dependency + they lead to. + +-.. command-output:: spack graph --deptype=link hdf5 ++.. command-output:: spack graph --deptype=link hdf5 target=x86_64 os=SUSE + + The ``deptype`` argument tells Spack what types of dependencies to graph. + By default it includes link and run dependencies but not build +@@ -4561,7 +4561,7 @@ dependencies. The default is ``--deptype=all``, which is equivalent to + You can also use ``spack graph`` to generate graphs in the widely used + `Dot `_ format. For example: + +-.. command-output:: spack graph --dot hdf5 ++.. command-output:: spack graph --dot hdf5 target=x86_64 os=SUSE + + This graph can be provided as input to other graphing tools, such as + those in `Graphviz `_. If you have graphviz +diff --git a/lib/spack/docs/workflows.rst b/lib/spack/docs/workflows.rst +index 4d3a97012..dbeb0df2c 100644 +--- a/lib/spack/docs/workflows.rst ++++ b/lib/spack/docs/workflows.rst +@@ -38,7 +38,7 @@ possible realization of a particular package, out of combinatorially + many other realizations. For example, here is a concrete spec + instantiated from ``curl``: + +-.. command-output:: spack spec curl ++.. command-output:: spack spec curl target=x86_64 os=SUSE + + Spack's core concretization algorithm generates concrete specs by + instantiating packages from its repo, based on a set of "hints", +-- +2.26.2 + diff --git a/spack.changes b/spack.changes index 9c816fe..1efcba9 100644 --- a/spack.changes +++ b/spack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 11 15:09:07 UTC 2020 - Christian Goll + +- added patch for more reproduceable output for the doc package + * added file: added-target-and-os-calls-to-output-of-spack-spec-co.patch + ------------------------------------------------------------------- Tue Dec 8 14:19:00 UTC 2020 - Christian Goll diff --git a/spack.spec b/spack.spec index a3c2a76..6040360 100644 --- a/spack.spec +++ b/spack.spec @@ -47,6 +47,7 @@ Patch0: Make-spack-paths-compliant-to-distro-installation.patch Patch1: fix-tumbleweed-naming.patch Patch2: Adapt-shell-scripts-that-set-up-the-environment-for-different-shells.patch Patch3: added-dockerfile-for-opensuse-leap-15.patch +Patch4: added-target-and-os-calls-to-output-of-spack-spec-co.patch # upstream patch removes also problemtatic binaries #Patch4: spack-test-15702.patch %if %{without doc} @@ -148,8 +149,8 @@ This package contains the info page. %prep %setup -q -%if %{without doc} %autopatch -p1 +%if %{without doc} # set SPACK_ROOT for i in share/spack/setup-env.*; do @@ -165,8 +166,26 @@ cd lib/spack/docs grep -rl ":target:" | xargs sed -i -e "/:target:/s/^/#/" -e "/figure::/s/^/#/" # Fix path to var - we install this to the 'real' /var grep -rl "\$SPACK_ROOT/var" | xargs sed -i -e "s@\(.*\)\$SPACK_ROOT/var\(/spack.*\)@\1/var/lib\2@g" -# spack cannot run without knowing at least the compiler -spack compiler find +# spack cannot run without knowing at least the compiler, so we inject +# a dummy one +mkdir -p ${HOME}/.spack/linux/ +cat > ${HOME}/.spack/linux/compilers.yaml <