summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2021-02-25 13:38:15 +0100
committerGitHub <noreply@github.com>2021-02-25 13:38:15 +0100
commitcf6aeace42aebb0c1c0c69e37d410ea19294028f (patch)
tree1fb2332392599ccde36462b5d890b1dbe21cc20b /var
parenta42d5357c3913de24fb7ad3fc84cc4258c359e00 (diff)
downloadspack-cf6aeace42aebb0c1c0c69e37d410ea19294028f.tar.gz
spack-cf6aeace42aebb0c1c0c69e37d410ea19294028f.tar.bz2
spack-cf6aeace42aebb0c1c0c69e37d410ea19294028f.tar.xz
spack-cf6aeace42aebb0c1c0c69e37d410ea19294028f.zip
openblas: add perl as a build dependency (#21908)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/openblas/0001-use-usr-bin-env-perl.patch55
-rw-r--r--var/spack/repos/builtin/packages/openblas/package.py5
2 files changed, 60 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openblas/0001-use-usr-bin-env-perl.patch b/var/spack/repos/builtin/packages/openblas/0001-use-usr-bin-env-perl.patch
new file mode 100644
index 0000000000..28de1277c9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/openblas/0001-use-usr-bin-env-perl.patch
@@ -0,0 +1,55 @@
+From ec6b354c32e939605331e2081590815a86413ca8 Mon Sep 17 00:00:00 2001
+From: Harmen Stoppels <harmenstoppels@gmail.com>
+Date: Wed, 24 Feb 2021 14:07:20 +0100
+Subject: [PATCH] use /usr/bin/env perl
+
+---
+ c_check | 2 +-
+ exports/gensymbol | 2 +-
+ f_check | 2 +-
+ interface/create | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/c_check b/c_check
+index 9c8b1aba..e24943a2 100644
+--- a/c_check
++++ b/c_check
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+
+ #use File::Basename;
+ # use File::Temp qw(tempfile);
+diff --git a/exports/gensymbol b/exports/gensymbol
+index 857a17a9..e7210a03 100644
+--- a/exports/gensymbol
++++ b/exports/gensymbol
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+
+ # Changelog
+ # 2017/09/03 staticfloat
+diff --git a/f_check b/f_check
+index ffe9c6b4..d044f254 100644
+--- a/f_check
++++ b/f_check
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+
+ $hostos = `uname -s | sed -e s/\-.*//`; chop($hostos);
+
+diff --git a/interface/create b/interface/create
+index b7be8ab6..0b9cefa2 100755
+--- a/interface/create
++++ b/interface/create
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+
+ $count = 0;
+
+--
+2.25.1
+
diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py
index 87ac9122e2..c2ac03fcd6 100644
--- a/var/spack/repos/builtin/packages/openblas/package.py
+++ b/var/spack/repos/builtin/packages/openblas/package.py
@@ -116,6 +116,9 @@ class Openblas(MakefilePackage):
patch('openblas_fujitsu_v0.3.11.patch', when='@0.3.11:0.3.12 %fj')
patch('openblas_fujitsu2.patch', when='@0.3.10:0.3.12 %fj')
+ # Use /usr/bin/env perl in build scripts
+ patch('0001-use-usr-bin-env-perl.patch', when='@:0.3.13')
+
# See https://github.com/spack/spack/issues/19932#issuecomment-733452619
conflicts('%gcc@7.0.0:7.3.99,8.0.0:8.2.99', when='@0.3.11:')
@@ -131,6 +134,8 @@ class Openblas(MakefilePackage):
conflicts('threads=openmp', when='%apple-clang', msg="Apple's clang does not support OpenMP")
conflicts('threads=openmp @:0.2.19', when='%clang', msg='OpenBLAS @:0.2.19 does not support OpenMP with clang!')
+ depends_on('perl', type='build')
+
@property
def parallel(self):
# unclear whether setting `-j N` externally was supported before 0.3