diff --git a/Adapt-shell-scripts-that-set-up-the-environment-for-different-shells.patch b/Adapt-shell-scripts-that-set-up-the-environment-for-different-shells.patch index 4926a10..9d18106 100644 --- a/Adapt-shell-scripts-that-set-up-the-environment-for-different-shells.patch +++ b/Adapt-shell-scripts-that-set-up-the-environment-for-different-shells.patch @@ -1,20 +1,19 @@ +From 360dd5abda2e7f14c87ace831ff4c9756c9d0444 Mon Sep 17 00:00:00 2001 From: Egbert Eich -Date: Wed Nov 10 13:01:17 2021 +0100 -Subject: Adapt shell scripts that set up the environment for different shells -Patch-mainline: Not yet -Git-repo: https://github.com/spack/spack -Git-commit: 565c91f4e3a40495fc470a8887df7dee9ced8c09 -References: +Date: Wed, 10 Nov 2021 13:01:17 +0100 +Subject: [PATCH] Adapt shell scripts that set up the environment for different + shells Signed-off-by: Egbert Eich Signed-off-by: Egbert Eich --- share/spack/setup-env.csh | 5 +++- - share/spack/setup-env.fish | 15 +----------- - share/spack/setup-env.sh | 61 ++-------------------------------------------- + share/spack/setup-env.fish | 15 +--------- + share/spack/setup-env.sh | 61 ++------------------------------------ 3 files changed, 7 insertions(+), 74 deletions(-) + diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh -index 4ac0503947..67fad7516c 100755 +index ad20d346d1..91c48ecae9 100755 --- a/share/spack/setup-env.csh +++ b/share/spack/setup-env.csh @@ -12,6 +12,10 @@ @@ -37,7 +36,7 @@ index 4ac0503947..67fad7516c 100755 # Set up module search paths in the user environment diff --git a/share/spack/setup-env.fish b/share/spack/setup-env.fish -index d16ee617df..84e3a9e044 100755 +index e00d8e76bb..961ec39015 100755 --- a/share/spack/setup-env.fish +++ b/share/spack/setup-env.fish @@ -671,12 +671,6 @@ end @@ -70,7 +69,7 @@ index d16ee617df..84e3a9e044 100755 # diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh -index 5136e8a58a..6aef191129 100755 +index d3a97d9af6..45195fb36f 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -249,64 +249,6 @@ _sp_shell=$(_spack_determine_shell) @@ -152,3 +151,6 @@ index 5136e8a58a..6aef191129 100755 fi # done: unset sentinel variable as we're no longer initializing +-- +2.40.1 + diff --git a/Add-support-for-container-building-using-a-SLE-base-container.patch b/Add-support-for-container-building-using-a-SLE-base-container.patch index 286aede..50d7088 100644 --- a/Add-support-for-container-building-using-a-SLE-base-container.patch +++ b/Add-support-for-container-building-using-a-SLE-base-container.patch @@ -1,19 +1,18 @@ +From 6bb3cfbfe614556b3a24fb832bf672b5b2352f3b Mon Sep 17 00:00:00 2001 From: Egbert Eich -Date: Wed Jan 12 13:51:57 2022 +0100 -Subject: Add support for container building using a SLE base container -Patch-mainline: Not yet -Git-commit: 9fa0183f8bcff032d20ce3ae4f8e5e5b1e3dea9b -References: +Date: Wed, 12 Jan 2022 13:51:57 +0100 +Subject: [PATCH] Add support for container building using a SLE base container Signed-off-by: Egbert Eich --- lib/spack/spack/container/images.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) + diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json -index b82596f2..64ac94a5 100644 +index 296658fe5e..a8be14610c 100644 --- a/lib/spack/spack/container/images.json +++ b/lib/spack/spack/container/images.json -@@ -41,6 +41,19 @@ +@@ -133,6 +133,19 @@ "image": "opensuse/leap:latest" } }, @@ -33,3 +32,6 @@ index b82596f2..64ac94a5 100644 "nvidia/cuda:11.2.1": { "bootstrap": { "template": "container/cuda_11_2_1.dockerfile", +-- +2.40.1 + diff --git a/Add-zypper-to-the-valid-container.os_packages-commands.patch b/Add-zypper-to-the-valid-container.os_packages-commands.patch deleted file mode 100644 index 88de987..0000000 --- a/Add-zypper-to-the-valid-container.os_packages-commands.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Egbert Eich -Date: Thu Apr 6 11:29:30 2023 +0200 -Subject: Add 'zypper' to the valid container.os_packages commands -Patch-mainline: Not yet -Git-commit: 0614150f86a3554118f60614e9b0cfaf8fb2aa12 -References: - -Signed-off-by: Egbert Eich -Signed-off-by: Egbert Eich ---- - lib/spack/docs/containers.rst | 2 +- - lib/spack/spack/schema/container.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst -index 9c6f8a26..1452b6a0 100644 ---- a/lib/spack/docs/containers.rst -+++ b/lib/spack/docs/containers.rst -@@ -498,7 +498,7 @@ to customize the generation of container recipes: - - No - * - ``os_packages:command`` - - Tool used to manage system packages -- - ``apt``, ``yum`` -+ - ``apt``, ``yum``, ``zypper`` - - Only with custom base images - * - ``os_packages:update`` - - Whether or not to update the list of available packages -diff --git a/lib/spack/spack/schema/container.py b/lib/spack/spack/schema/container.py -index b05199f8..7c98a1db 100644 ---- a/lib/spack/spack/schema/container.py -+++ b/lib/spack/spack/schema/container.py -@@ -54,7 +54,7 @@ - "os_packages": { - "type": "object", - "properties": { -- "command": {"type": "string", "enum": ["apt", "yum"]}, -+ "command": {"type": "string", "enum": ["apt", "yum", "zypper"]}, - "update": {"type": "boolean"}, - "build": _list_of_packages, - "final": _list_of_packages, diff --git a/Fix-Spinx-configuration-to-avoid-throwing-errors.patch b/Fix-Spinx-configuration-to-avoid-throwing-errors.patch index 0c2cd3e..93ad171 100644 --- a/Fix-Spinx-configuration-to-avoid-throwing-errors.patch +++ b/Fix-Spinx-configuration-to-avoid-throwing-errors.patch @@ -1,4 +1,4 @@ -From 66bdd2b54c5e6d1ddc9a3970b120dda2ac69e52e Mon Sep 17 00:00:00 2001 +From 223f11bab87c9f5915ef7146b26d0935c7ff18e3 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 10 Nov 2021 16:30:14 +0100 Subject: [PATCH] Fix Spinx configuration to avoid throwing errors @@ -13,10 +13,10 @@ Signed-off-by: Egbert Eich 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py -index 4fc321c72d..d31c2fe980 100644 +index 8ba6717147..521511db2f 100644 --- a/lib/spack/docs/conf.py +++ b/lib/spack/docs/conf.py -@@ -130,7 +130,6 @@ def setup(sphinx): +@@ -133,7 +133,6 @@ def setup(sphinx): "sphinx.ext.napoleon", "sphinx.ext.todo", "sphinx.ext.viewcode", @@ -24,13 +24,12 @@ index 4fc321c72d..d31c2fe980 100644 "sphinxcontrib.programoutput", ] -@@ -415,5 +414,5 @@ class SpackStyle(DefaultStyle): +@@ -418,4 +417,4 @@ class SpackStyle(DefaultStyle): + # -- Extension configuration ------------------------------------------------- # sphinx.ext.intersphinx - intersphinx_mapping = { -- "python": ("https://docs.python.org/3", None), -+ "python": ("https://docs.python.org/3", "objects.inv"), - } +-intersphinx_mapping = {"python": ("https://docs.python.org/3", None)} ++intersphinx_mapping = {"python": ("https://docs.python.org/3", "objects.inv")} -- -2.35.3 +2.40.1 diff --git a/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch b/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch index 51582d7..14520ee 100644 --- a/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch +++ b/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch @@ -1,4 +1,4 @@ -From dc83f5aa199bd7a393f32f53611e069d7475ccfc Mon Sep 17 00:00:00 2001 +From c24349cb54442da8e49fd40a299453e56b404a90 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 7 Apr 2022 20:25:46 +0200 Subject: [PATCH] Fix error during documentation build due to recursive module @@ -11,10 +11,10 @@ Signed-off-by: Egbert Eich 1 file changed, 4 insertions(+) diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py -index f0598e5a83..76f50ff69c 100644 +index a4312df6dc..10bfbd2a4d 100644 --- a/lib/spack/spack/environment/environment.py +++ b/lib/spack/spack/environment/environment.py -@@ -36,6 +36,10 @@ +@@ -41,6 +41,10 @@ import spack.subprocess_context import spack.traverse import spack.user_environment as uenv @@ -26,5 +26,5 @@ index f0598e5a83..76f50ff69c 100644 import spack.util.environment import spack.util.hash -- -2.35.3 +2.40.1 diff --git a/Make-spack-paths-compliant-to-distro-installation.patch b/Make-spack-paths-compliant-to-distro-installation.patch index ca53956..0863c0e 100644 --- a/Make-spack-paths-compliant-to-distro-installation.patch +++ b/Make-spack-paths-compliant-to-distro-installation.patch @@ -1,9 +1,7 @@ +From a91079b55fa90142d9de03ffe219812a26937959 Mon Sep 17 00:00:00 2001 From: Egbert Eich -Date: Wed Jan 11 14:30:19 2023 +0100 -Subject: Make spack paths compliant to distro installation -Patch-mainline: Not yet -Git-commit: c74fb7ed42aa94609c8cc8c005b004357307bb34 -References: +Date: Wed, 11 Jan 2023 14:30:19 +0100 +Subject: [PATCH] Make spack paths compliant to distro installation Spack is particular about the choice of 'prefix' which will replace $spack. 'prefix' is the 4th ancestor of paths.py, so @@ -18,8 +16,9 @@ Signed-off-by: Egbert Eich --- lib/spack/spack/paths.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) + diff --git a/lib/spack/spack/paths.py b/lib/spack/spack/paths.py -index f03f6eb1..914aea93 100644 +index 18656b76c2..f0e9cb587c 100644 --- a/lib/spack/spack/paths.py +++ b/lib/spack/spack/paths.py @@ -41,7 +41,7 @@ @@ -44,3 +43,6 @@ index f03f6eb1..914aea93 100644 packages_path = os.path.join(repos_path, "builtin") mock_packages_path = os.path.join(repos_path, "builtin.mock") +-- +2.40.1 + diff --git a/Set-modules-default-to-lmod.patch b/Set-modules-default-to-lmod.patch index 2dac422..c41d42f 100644 --- a/Set-modules-default-to-lmod.patch +++ b/Set-modules-default-to-lmod.patch @@ -1,4 +1,4 @@ -From ff6db56de20859436a1bfff30d22910bad0557d9 Mon Sep 17 00:00:00 2001 +From 1e351fa2c0f93ad119d4e5c61ea4307b9522c22e Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 10 Nov 2021 20:28:29 +0100 Subject: [PATCH] Set modules default to lmod @@ -6,22 +6,23 @@ Subject: [PATCH] Set modules default to lmod Signed-off-by: Egbert Eich Signed-off-by: Egbert Eich --- - etc/spack/defaults/modules.yaml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + etc/spack/defaults/modules.yaml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/spack/defaults/modules.yaml b/etc/spack/defaults/modules.yaml -index 27450b4259..9b476b7c69 100644 +index 75ec366117..16212b4e9b 100644 --- a/etc/spack/defaults/modules.yaml +++ b/etc/spack/defaults/modules.yaml -@@ -42,7 +42,7 @@ modules: +@@ -41,7 +41,8 @@ modules: + tcl: $spack/share/spack/modules lmod: $spack/share/spack/lmod - # What type of modules to use - enable: -- - tcl + # What type of modules to use ("tcl" and/or "lmod") +- enable: [] ++ enable: + - lmod tcl: all: -- -2.35.3 +2.40.1 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 index 3f1f082..16005e4 100644 --- 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 @@ -1,4 +1,4 @@ -From a80d5cd883263271650925926dfd734f488bb731 Mon Sep 17 00:00:00 2001 +From 1221c1f6b68cbba3a14592a686aec742b5fd02d2 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Fri, 11 Dec 2020 15:37:48 +0100 Subject: [PATCH] added target and os calls to output of spack spec commands @@ -10,10 +10,10 @@ Subject: [PATCH] added target and os calls to output of spack spec commands 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/spack/docs/developer_guide.rst b/lib/spack/docs/developer_guide.rst -index 6b67ef9f77..695e3a84bc 100644 +index 4dc8d1249d..42b67425ab 100644 --- a/lib/spack/docs/developer_guide.rst +++ b/lib/spack/docs/developer_guide.rst -@@ -761,7 +761,7 @@ supply ``--profile`` to Spack on the command line, before any subcommands. +@@ -758,7 +758,7 @@ supply ``--profile`` to Spack on the command line, before any subcommands. ``spack --profile`` output looks like this: @@ -23,10 +23,10 @@ index 6b67ef9f77..695e3a84bc 100644 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 1bf99e09b3..6b01bf4950 100644 +index 3c077490a2..0a0a0d0913 100644 --- a/lib/spack/docs/getting_started.rst +++ b/lib/spack/docs/getting_started.rst -@@ -206,7 +206,7 @@ Check Installation +@@ -204,7 +204,7 @@ Check Installation With Spack installed, you should be able to run some basic Spack commands. For example: @@ -36,10 +36,10 @@ index 1bf99e09b3..6b01bf4950 100644 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 5b0e556b34..600f0fb72e 100644 +index 586fdcec6e..1a7e23c426 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst -@@ -6099,13 +6099,13 @@ Spack provides the ``spack graph`` command for graphing dependencies. +@@ -6382,13 +6382,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: @@ -55,7 +55,7 @@ index 5b0e556b34..600f0fb72e 100644 The ``deptype`` argument tells Spack what types of dependencies to graph. By default it includes link and run dependencies but not build -@@ -6120,7 +6120,7 @@ dependencies. The default is ``--deptype=all``, which is equivalent to +@@ -6403,7 +6403,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: @@ -65,5 +65,5 @@ index 5b0e556b34..600f0fb72e 100644 This graph can be provided as input to other graphing tools, such as those in `Graphviz `_. If you have graphviz -- -2.38.0 +2.40.1 diff --git a/spack-0.19.2.tar.gz b/spack-0.19.2.tar.gz deleted file mode 100644 index 815bcd5..0000000 --- a/spack-0.19.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4978b37da50f5690f4e1aa0cfe3975a89ccef85d96c68d417ea0716a8ce3aa98 -size 9424447 diff --git a/spack-0.20.0.tar.gz b/spack-0.20.0.tar.gz new file mode 100644 index 0000000..3a6bdd4 --- /dev/null +++ b/spack-0.20.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a189b4e8173eefdf76617445125b329d912f730767048846c38c8a2637396a7d +size 9685007 diff --git a/spack.changes b/spack.changes index 820e603..1cc9195 100644 --- a/spack.changes +++ b/spack.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Thu Jun 1 11:32:36 UTC 2023 - Egbert Eich + +- Do not attempt to build documentation for 32-bit, s390x and + ppc64*. There are build issues on some build targets. + +------------------------------------------------------------------- +Mon May 22 14:40:17 UTC 2023 - Christian Goll + +- Update to version 0.20.0 with the following features: + * Exact versions: Spack did not previously have a way to distinguish a + version if it was a prefix of some other version. For example, @3.2 would + match 3.2, 3.2.1, 3.2.2, etc. You can now match exactly 3.2 with @=3.2. + This is useful, for example, if you need to patch only the 3.2 version of a + package + * More stable concretization: Now, spack concretize will only concretize the + new portions of the environment and will not change existing parts of an + environment unless you specify --force. This has always been true for + unify:false, but not for unify:true and unify:when_possible environments. + * The concretizer has a new --reuse-deps argument that only reuses dependencies. + That is, it will always treat the roots of your environment as it would with + --fresh. This allows you to upgrade just the roots of your environment while + keeping everything else stable + * Specs in buildcaches can be referenced by hash: Previously, you could run + spack buildcache list and see the hashes in buildcaches, but referring to + them by hash would fail. You can now run commands like spack spec and + spack install and refer to buildcache hashes directly, e.g. spack install + /abc123 + * New package and buildcache index websites + Our public websites for searching packages have been completely revamped + and updated. You can check them out here: + Package Index: https://packages.spack.io + Buildcache Index: https://cache.spack.io + Both are searchable and more interactive than before. Currently major + releases are shown; UI for browsing develop snapshots is coming soon. + * Default CMake and Meson build types are now Release: Spack has historically + defaulted to building with optimization and debugging, but packages like + llvm can be enormous with debug turned on. Our default build type for all + Spack packages is now Release. This has a number of benefits: + much smaller binaries; + higher default optimization level; and + defining NDEBUG disables assertions, which may lead to further speedups. + You can still get the old behavior back through requirements and package + preferences + * spack checksum can automatically add new versions to package + * new command: spack pkg grep to easily search package files + * New maintainers directive + * Add spack buildcache push (alias to buildcache create) + * Allow using -j to control the parallelism of concretization + * Add --exclude option to 'spack external find' + requires() directive and enhanced package requirements We've added some + more enhancements to requirements in Spack. There is a new requires() + directive for packages. requires() is the opposite of conflicts() + +- removed Add-zypper-to-the-valid-container.os_packages-commands.patch + as incoperated upstream + ------------------------------------------------------------------- Mon Apr 17 06:59:15 UTC 2023 - Egbert Eich diff --git a/spack.spec b/spack.spec index dc2d8f9..1165122 100644 --- a/spack.spec +++ b/spack.spec @@ -19,6 +19,9 @@ %global flavor @BUILD_FLAVOR@%{?nil} %if "%{flavor}" == "doc" %bcond_without doc +%ifarch i586 %arm s390 s390x %power64 ppc +ExclusiveArch: do_not_build +%endif %endif %if %{with doc} && (0%{?sle_version} > 0) && (150200 >= 0%{?sle_version}) @@ -43,7 +46,7 @@ ExclusiveArch: do_not_build # non oss packages %define spack_trigger_external cuda-nvcc Name: spack -Version: 0.19.2 +Version: 0.20.0 Release: 0 Summary: Package manager for HPC systems License: Apache-2.0 AND MIT AND Python-2.0 AND BSD-3-Clause @@ -63,7 +66,6 @@ Patch6: Fix-error-during-documentation-build-due-to-recursive-module-inc Patch7: Fix-Spinx-configuration-to-avoid-throwing-errors.patch Patch8: Set-modules-default-to-lmod.patch Patch9: Add-support-for-container-building-using-a-SLE-base-container.patch -Patch10: Add-zypper-to-the-valid-container.os_packages-commands.patch %if %{without doc} BuildRequires: fdupes BuildRequires: lua-lmod @@ -203,7 +205,7 @@ args=${1+"$@"} while [ -n "$1" ]; do case $1 in --*) shift ;; - graph|spec) exit 0 ;; + graph|spec|unit-test) exit 0 ;; *) exec /usr/bin/spack ${args} ;; esac; done diff --git a/spack_get_libs.sh b/spack_get_libs.sh index 5beced0..677da41 100644 --- a/spack_get_libs.sh +++ b/spack_get_libs.sh @@ -105,6 +105,8 @@ get_paths() print_env LD_LIBRARY_PATH "${ld_library_path}\$LD_LIBRARY_PATH" } +source /usr/share/spack/setup-env.sh + spack_srcd=false ( [[ -n $ZSH_VERSION && $ZSH_EVAL_CONTEXT =~ :file$ ]] ||