summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/netcdf-fortran/no_parallel_build.patch12
-rw-r--r--var/spack/repos/builtin/packages/netcdf-fortran/package.py4
2 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/no_parallel_build.patch b/var/spack/repos/builtin/packages/netcdf-fortran/no_parallel_build.patch
new file mode 100644
index 0000000000..c232a62bc5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/netcdf-fortran/no_parallel_build.patch
@@ -0,0 +1,12 @@
+--- a/fortran/Makefile.in 2019-09-18 12:29:45.000000000 -0500
++++ b/fortran/Makefile.in 2020-01-24 10:56:03.660035265 -0600
+@@ -1095,6 +1095,9 @@
+ @USE_LOGGING_TRUE@ echo ' integer nf_set_log_level' >> netcdf.inc
+ @USE_LOGGING_TRUE@ echo ' external nf_set_log_level' >> netcdf.inc
+
++# Turn off parallel builds in this directory.
++.NOTPARALLEL:
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py
index 891ad5b81a..e3703fd609 100644
--- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py
+++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py
@@ -36,6 +36,10 @@ class NetcdfFortran(AutotoolsPackage):
# https://github.com/Unidata/netcdf-fortran/issues/94
patch('nag.patch', when='@:4.4.4%nag')
+ # Parallel builds do not work in the fortran directory. This patch is
+ # derived from https://github.com/Unidata/netcdf-fortran/pull/211
+ patch('no_parallel_build.patch', when='@4.5.2')
+
def flag_handler(self, name, flags):
if name in ['cflags', 'fflags'] and '+pic' in self.spec:
flags.append(self.compiler.pic_flag)