Set netcdf-fortran to build serially with Intel compiler (#14461)
* Set netcdf-fortran to build serially with Intel compiler This PR turns off parallel builds when the Intel compiler is used. Builds with the Intel compiler will fail otherwise. * Change how parallel build is handled Use patch from netcdf-fortran project to turn off parallel buildi for version 4.5.2.
This commit is contained in:
parent
2b0b340aab
commit
e710656310
2 changed files with 16 additions and 0 deletions
|
@ -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:
|
|
@ -36,6 +36,10 @@ class NetcdfFortran(AutotoolsPackage):
|
||||||
# https://github.com/Unidata/netcdf-fortran/issues/94
|
# https://github.com/Unidata/netcdf-fortran/issues/94
|
||||||
patch('nag.patch', when='@:4.4.4%nag')
|
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):
|
def flag_handler(self, name, flags):
|
||||||
if name in ['cflags', 'fflags'] and '+pic' in self.spec:
|
if name in ['cflags', 'fflags'] and '+pic' in self.spec:
|
||||||
flags.append(self.compiler.pic_flag)
|
flags.append(self.compiler.pic_flag)
|
||||||
|
|
Loading…
Reference in a new issue