openblas %oneapi: patch f_check for proper linkage (#31737)

This commit is contained in:
eugeneswalker 2022-07-25 15:38:11 -07:00 committed by GitHub
parent 7be0dac36b
commit 0662bbdc43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,31 @@
diff -ruN spack-src/f_check spack-src-new/f_check
--- spack-src/f_check 2022-02-20 13:35:05.000000000 -0800
+++ spack-src-new/f_check 2022-07-25 14:41:31.877584474 -0700
@@ -34,7 +34,7 @@
"pathf90", "pathf95",
"pgf95", "pgf90", "pgf77", "pgfortran", "nvfortran",
"flang", "egfortran",
- "ifort", "nagfor");
+ "ifort", "nagfor", "ifx");
OUTER:
foreach $lists (@lists) {
@@ -90,6 +90,9 @@
if ($compiler =~ /flang/) {
$vendor = FLANG;
$openmp = "-fopenmp";
+ } elsif ($compiler =~ /ifx/) {
+ $vendor = INTEL;
+ $openmp = "-fopenmp";
} elsif ($compiler =~ /pgf/ || $compiler =~ /nvf/) {
$vendor = PGI;
$openmp = "-mp";
@@ -176,7 +179,7 @@
$openmp = "-fopenmp";
}
- if ($compiler =~ /ifort/) {
+ if ($compiler =~ /ifort/ || $compiler =~ /ifx/) {
$vendor = INTEL;
$bu = "_";
$openmp = "-fopenmp";

View File

@ -69,6 +69,9 @@ class Openblas(MakefilePackage):
provides('lapack@3.9.1:', when='@0.3.15:')
provides('lapack@3.7.0', when='@0.2.20')
# https://github.com/spack/spack/issues/31732
patch('f_check-oneapi.patch', when='@0.3.20 %oneapi')
# OpenBLAS >=3.0 has an official way to disable internal parallel builds
patch('make.patch', when='@0.2.16:0.2.20')
# This patch is in a pull request to OpenBLAS that has not been handled