forked from pool/spack
- Update to 0.22.1. * Bug Fixes: - Fix reuse of externals on Linux. - Ensure parent gcc-runtime version >= child. - Ensure the latest gcc-runtime is rpath'ed when multiple exist among link deps. - Improve version detection of glibc. - Improve heuristics for solver. - Make strong preferences override reuse. - Reduce verbosity when C compiler is missing. - Make missing ccache executable an error when required. - Make every environment view containing `python` a `venv`. - Fix external detection for compilers with os but no target. - Fix version optimization for roots. - Handle common implementations of pagination of tags in OCI build caches. - Apply fetched patches to develop specs. - Avoid Windows wrappers for filesystem utilities on non-Windows. - Fix formatting issue in `spack audit`. * Package updates: - Require libiconv for iconv. Notice that glibc/musl also provide iconv, but are not guaranteed to be complete. Set `packages:iconv:require:[glibc]` to restore the old behavior. - protobuf: fix 3.4:3.21 patch checksum. - protobuf: update hash for patch needed when="@3.4:3.21". - git: bump v2.39 to 2.45; deprecate unsafe versions. - gcc: use `-rpath {rpath_dir}` not `-rpath={rpath dir}`. - Remove mesa18 and libosmesa. - Enforce consistency of `gl` providers. OBS-URL: https://build.opensuse.org/request/show/1186519 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=107
28 lines
956 B
Diff
28 lines
956 B
Diff
From c24349cb54442da8e49fd40a299453e56b404a90 Mon Sep 17 00:00:00 2001
|
|
From: Egbert Eich <eich@suse.com>
|
|
Date: Thu, 7 Apr 2022 20:25:46 +0200
|
|
Subject: [PATCH] Fix error during documentation build due to recursive module
|
|
inclusion
|
|
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
|
Signed-off-by: Egbert Eich <eich@suse.de>
|
|
---
|
|
lib/spack/spack/environment/environment.py | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
Index: spack-0.20.3/lib/spack/spack/environment/environment.py
|
|
===================================================================
|
|
--- spack-0.20.3.orig/lib/spack/spack/environment/environment.py
|
|
+++ spack-0.20.3/lib/spack/spack/environment/environment.py
|
|
@@ -40,6 +40,10 @@ import spack.stage
|
|
import spack.store
|
|
import spack.subprocess_context
|
|
import spack.user_environment as uenv
|
|
+try:
|
|
+ import spack.user_environment as uenv
|
|
+except AttributeError:
|
|
+ pass
|
|
import spack.util.cpus
|
|
import spack.util.environment
|
|
import spack.util.hash
|