From 7a2b3b2588a97655ca76efc20b7f10b0777800de Mon Sep 17 00:00:00 2001 From: Ondřej Čertík Date: Thu, 23 Nov 2017 07:28:35 -0700 Subject: Add a patch for Intel 18.0.1 (#6392) --- .../builtin/packages/openblas/openblas_icc_fortran2.patch | 14 ++++++++++++++ var/spack/repos/builtin/packages/openblas/package.py | 1 + 2 files changed, 15 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openblas/openblas_icc_fortran2.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/openblas_icc_fortran2.patch b/var/spack/repos/builtin/packages/openblas/openblas_icc_fortran2.patch new file mode 100644 index 0000000000..64785d4f45 --- /dev/null +++ b/var/spack/repos/builtin/packages/openblas/openblas_icc_fortran2.patch @@ -0,0 +1,14 @@ +diff --git a/f_check b/f_check +index 79febfb..c9da6ed 100644 +--- a/f_check ++++ b/f_check +@@ -359,9 +359,6 @@ print MAKEFILE "NOFORTRAN=1\n" if $nofortran == 1; + + print CONFFILE "#define BUNDERSCORE\t$bu\n" if $bu ne ""; + print CONFFILE "#define NEEDBUNDERSCORE\t1\n" if $bu ne ""; +-print CONFFILE "#define NEED2UNDERSCORES\t1\n" if $need2bu ne ""; +- +-print MAKEFILE "NEED2UNDERSCORES=1\n" if $need2bu ne ""; + + if (($linker_l ne "") || ($linker_a ne "")) { + print MAKEFILE "FEXTRALIB=$linker_L $linker_l $linker_a\n"; diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 6258cfa09d..4019b09935 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -79,6 +79,7 @@ class Openblas(MakefilePackage): patch('openblas_icc.patch', when='@:0.2.19%intel') patch('openblas_icc_openmp.patch', when='%intel@16.0:') patch('openblas_icc_fortran.patch', when='%intel@16.0:') + patch('openblas_icc_fortran2.patch', when='%intel@18.0:') # Fixes compilation error on POWER8 with GCC 7 # https://github.com/xianyi/OpenBLAS/pull/1098 -- cgit v1.2.3-60-g2f50