From 2ac648407e5302f6ae16ccf33c0f8c1b44d8f797 Mon Sep 17 00:00:00 2001 From: Serban Maerean Date: Fri, 28 Sep 2018 13:46:21 -0400 Subject: [PATCH] Add PETSc 3.10.1 to PETSc's spackage file (#9382) * Add version 3.10.1 to the PETSc spackage file. * Makefile changes required for building PETSc native tests with the XL compiler. --- .../repos/builtin/packages/petsc/package.py | 1 + .../packages/petsc/xlc-test-3.10.1.diff | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 var/spack/repos/builtin/packages/petsc/xlc-test-3.10.1.diff diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index d65da2a84a..7b89028820 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -43,6 +43,7 @@ class Petsc(Package): version('develop', branch='master') version('xsdk-0.2.0', tag='xsdk-0.2.0') + version('3.10.1', '2d0d5a9bd8112a4147a2a23f7f62a906') version('3.10.0', '0240c2ce8c54e47b3531a743ee844d41') version('3.9.4', 'c98eb67573efb2f91c6f239368259e44') version('3.9.3', '7b71d705f66f9961cb0e2da3f9da79a1') diff --git a/var/spack/repos/builtin/packages/petsc/xlc-test-3.10.1.diff b/var/spack/repos/builtin/packages/petsc/xlc-test-3.10.1.diff new file mode 100644 index 0000000000..7009ea450d --- /dev/null +++ b/var/spack/repos/builtin/packages/petsc/xlc-test-3.10.1.diff @@ -0,0 +1,19 @@ +--- a/gmakefile.test ++++ b/gmakefile.test +@@ -127,11 +127,14 @@ + endif + -@$(GFORTRAN_DEP_CLEANUP) + ++#add xlf2003 flags ++XLF2003FLAGS = "-qxlf2003=polymorphic:bozlitargs:stopexcept:volatile:autorealloc" ++ + $(TESTDIR)/%.o : $(EXAMPLESDIR)/%.F90 | $$(@D)/.DIR + ifeq ($(FC_MODULE_OUTPUT_FLAG),) + $(call quiet,FCMOD) $(MODDIR) && $(FC) -c $(FC_FLAGS) $(FFLAGS) $(FCPPFLAGS) $(FC_DEPFLAGS) -I$(dir $<) $(abspath $<) -o $(abspath $@) + else +- $(PETSC_COMPILE.F) -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) $(FC_MODULE_FLAG)$(MODDIR) ++ $(PETSC_COMPILE.F) ${XLF2003FLAGS} -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) $(FC_MODULE_FLAG)$(MODDIR) + endif + -@$(GFORTRAN_DEP_CLEANUP) + +