From 400c34c8dbb3f999a84e4529e949f22c084eea3819d43c075c0bfea1ba2a82c4 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 6 Jul 2021 21:48:15 +0000 Subject: [PATCH] - Fix patch Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch to actually work correctly. - Remove duplicates in spec file. OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=26 --- ...ld-due-to-recursive-module-inclusion.patch | 40 +++++++++++++++++++ spack.changes | 10 ++--- spack.spec | 1 - 3 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch 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 new file mode 100644 index 0000000..95e0bfe --- /dev/null +++ b/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch @@ -0,0 +1,40 @@ +From: Egbert Eich +Date: Thu Feb 4 09:17:55 2021 +0100 +Subject: Fix error during documentation build due to recursive module inclusion +Patch-mainline: Not yet +Git-commit: 7102b892cfc6e0697b658f35b7774a03bd1c42e9 +References: + +Signed-off-by: Egbert Eich +--- + lib/spack/spack/user_environment.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +diff --git a/lib/spack/spack/user_environment.py b/lib/spack/spack/user_environment.py +index f08f21e..0da6c43 100644 +--- a/lib/spack/spack/user_environment.py ++++ b/lib/spack/spack/user_environment.py +@@ -8,7 +8,7 @@ + import spack.config + import spack.util.prefix as prefix + import spack.util.environment as environment +-import spack.build_environment as build_env ++import spack.build_environment + + #: Environment variable name Spack uses to track individually loaded packages + spack_loaded_hashes_var = 'SPACK_LOADED_HASHES' +@@ -85,13 +85,13 @@ def environment_modifications_for_spec(spec, view=None): + # Let the extendee/dependency modify their extensions/dependents + # before asking for package-specific modifications + env.extend( +- build_env.modifications_from_dependencies( ++ spack.build_environment.modifications_from_dependencies( + spec, context='run' + ) + ) + + # Package specific modifications +- build_env.set_module_variables_for_package(spec.package) ++ spack.build_environment.set_module_variables_for_package(spec.package) + spec.package.setup_run_environment(env) + + return env diff --git a/spack.changes b/spack.changes index 8769ae5..b432cf3 100644 --- a/spack.changes +++ b/spack.changes @@ -1,9 +1,10 @@ ------------------------------------------------------------------- -Tue Jul 6 14:32:07 UTC 2021 - Christian Goll +Tue Jul 6 21:45:21 UTC 2021 - Egbert Eich -- removed - Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch - as this fixes bsc#1188040 +- Fix patch + Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch + to actually work correctly. +- Remove duplicates in spec file. ------------------------------------------------------------------- Wed Jun 2 14:04:26 UTC 2021 - Antoine Ginies @@ -41,7 +42,6 @@ Mon May 3 06:34:46 UTC 2021 - Egbert Eich - Add alternative c++ & fortran compilers to the triggers list. ------------------------------------------------------------------- ->>>>>>> ./spack.changes.r935baeb217850b583c41a8f55bbd82e3 Tue Mar 30 14:31:26 UTC 2021 - Christian Goll - added run-find-external.sh which calls the command in post diff --git a/spack.spec b/spack.spec index 27d0005..fd6bd1c 100644 --- a/spack.spec +++ b/spack.spec @@ -71,7 +71,6 @@ Requires: libbz2-devel Requires: lua-lmod Requires: patch Requires: polkit -Requires: spack-recipes Requires: sudo Requires: xz Recommends: %spack_trigger_recommended