summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDom Heinzeller <dom.heinzeller@icloud.com>2023-03-16 13:22:57 -0600
committerGitHub <noreply@github.com>2023-03-16 12:22:57 -0700
commit4572052c634fc75b47f8e8d647a9692597bf0739 (patch)
tree37ba602aea3ea69f4ae9f5cf8bfe1beed13ece82 /var
parentba00da61e4b0977a16d00e3579b7e07346fdb51e (diff)
downloadspack-4572052c634fc75b47f8e8d647a9692597bf0739.tar.gz
spack-4572052c634fc75b47f8e8d647a9692597bf0739.tar.bz2
spack-4572052c634fc75b47f8e8d647a9692597bf0739.tar.xz
spack-4572052c634fc75b47f8e8d647a9692597bf0739.zip
Modify info print of ESMF_CPP due to permission denied errors in spack on MSU Hercules (#35969)
* Skip info print of ESMF_CPP due to permission denied errors in spack on MSU Hercules * Better version of patch
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/esmf/esmf_cpp_info.patch11
-rw-r--r--var/spack/repos/builtin/packages/esmf/package.py4
2 files changed, 15 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/esmf/esmf_cpp_info.patch b/var/spack/repos/builtin/packages/esmf/esmf_cpp_info.patch
new file mode 100644
index 0000000000..de5d3db599
--- /dev/null
+++ b/var/spack/repos/builtin/packages/esmf/esmf_cpp_info.patch
@@ -0,0 +1,11 @@
+--- a/makefile 2023-03-08 22:04:26.000000000 -0600
++++ b/makefile 2023-03-08 22:05:14.000000000 -0600
+@@ -97,7 +97,7 @@
+ -@echo "C Compiler version:"; $(ESMF_CCOMPILER_VERSION); echo ""
+ -@echo "--------------------------------------------------------------"
+ -@echo "Preprocessor version:"
+- @$(ESMF_CPP) --version $(ESMF_DIR)/scripts/empty.C
++ -@echo `$(ESMF_CPP) --version $(ESMF_DIR)/scripts/empty.C`
+ ifeq ($(pathtype),abs)
+ -@echo "--------------------------------------------------------------"
+ -@echo "NetCDF library version: `$(ESMF_NETCDF) --version`"
diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py
index b2519cf66c..50d9cf6c6b 100644
--- a/var/spack/repos/builtin/packages/esmf/package.py
+++ b/var/spack/repos/builtin/packages/esmf/package.py
@@ -102,6 +102,10 @@ class Esmf(MakefilePackage):
# https://trac.macports.org/ticket/57493
patch("cstddef.patch", when="@7.1.0r %gcc@8:")
+ # Skip info print of ESMF_CPP due to permission denied errors
+ # https://github.com/spack/spack/issues/35957
+ patch("esmf_cpp_info.patch")
+
# Make script from mvapich2.patch executable
@when("@:7.0")
@run_before("build")