diff options
| author | Mikael Simberg <mikael.simberg@iki.fi> | 2023-08-14 17:03:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-14 17:03:13 +0200 |
| commit | f0ed159a1b4376e38347d9e35613716ab7684594 (patch) | |
| tree | f7102d30e571c2b9d72de48b1c78875763510c65 /var | |
| parent | 9bf7fa0067a11940c7a97e629e4f4cc41289fb9d (diff) | |
| download | spack-f0ed159a1b4376e38347d9e35613716ab7684594.tar.gz spack-f0ed159a1b4376e38347d9e35613716ab7684594.tar.bz2 spack-f0ed159a1b4376e38347d9e35613716ab7684594.tar.xz spack-f0ed159a1b4376e38347d9e35613716ab7684594.zip | |
Add patch to build silo on nixos (#39375)
Change the shebang in mkinc from /usr/bin/perl to /usr/bin/env perl for
portability to systems that don't necessarily have perl in /usr/bin.
Also adds perl as a build-time dependency.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/silo/mkinc-usr-bin-env-perl.patch | 23 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/silo/package.py | 4 |
2 files changed, 27 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/silo/mkinc-usr-bin-env-perl.patch b/var/spack/repos/builtin/packages/silo/mkinc-usr-bin-env-perl.patch new file mode 100644 index 0000000000..13f233010c --- /dev/null +++ b/var/spack/repos/builtin/packages/silo/mkinc-usr-bin-env-perl.patch @@ -0,0 +1,23 @@ +diff --git a/config/mkinc b/config/mkinc +index e52bb64..6d96176 100755 +--- a/config/mkinc ++++ b/config/mkinc +@@ -17,7 +17,7 @@ exec perl /tmp/visitperl$$ $0 ${1+"$@"} + unlink $0; + $0 = shift @ARGV; + +-#!/usr/bin/perl ++#!/usr/bin/env perl + ######################################################################### + # Copyright (C) 1994-2016 Lawrence Livermore National Security, LLC. + # LLNL-CODE-425250. +diff --git a/config/mklite b/config/mklite +index f9394a9..274c867 100755 +--- a/config/mklite ++++ b/config/mklite +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + + # + # Tool to generate lite_pdb.h file from pdb.h and score.h headers. diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 60abdb1bf9..04427ae5f2 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -46,6 +46,7 @@ class Silo(AutotoolsPackage): variant("hzip", default=True, description="Enable hzip support") variant("fpzip", default=True, description="Enable fpzip support") + depends_on("perl", type="build") depends_on("m4", type="build", when="+shared") depends_on("autoconf", type="build", when="+shared") depends_on("autoconf-archive", type="build", when="+shared") @@ -89,6 +90,9 @@ class Silo(AutotoolsPackage): # zfp include missing patch("zfp_error.patch", when="@4.11 +hdf5") + # use /usr/bin/env perl for portability + patch("mkinc-usr-bin-env-perl.patch") + def flag_handler(self, name, flags): spec = self.spec if name == "ldflags": |