zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ncl: consolidate patch methods (#44333)

Browse Source
This commit is contained in:
Brian Vanderwende
2024-06-05 09:37:25 -06:00
committed by GitHub
parent e53bc780e4
commit 3433c8b8a5
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
var/spack/repos/builtin/packages/ncl/package.py
View File

@@ -136,18 +136,26 @@ def patch(self):
# Make configure scripts use Spack's tcsh # Make configure scripts use Spack's tcsh
files = ["Configure"] + glob.glob("config/*") files = ["Configure"] + glob.glob("config/*")
filter_file("^#!/bin/csh -f", "#!/usr/bin/env csh", *files)
@run_before("install")
def filter_sbang(self):
# Filter sbang before install so Spack's sbang hook can fix it up # Filter sbang before install so Spack's sbang hook can fix it up
files = glob.glob("ncarg2d/src/bin/scripts/*") files += glob.glob("ncarg2d/src/bin/scripts/*")
files += glob.glob("ncarview/src/bin/scripts/*") files += glob.glob("ncarview/src/bin/scripts/*")
files += glob.glob("ni/src/scripts/*") files += glob.glob("ni/src/scripts/*")
csh = join_path(self.spec["tcsh"].prefix.bin, "csh") csh = join_path(self.spec["tcsh"].prefix.bin, "csh")
filter_file("^#!/bin/csh", "#!{0}".format(csh), *files) filter_file("^#!/bin/csh.*", "#!{0}".format(csh), *files)
if self.spec.satisfies("+grib"):
# Newer versions of libjasper do not provide the inmem property
if self.spec.satisfies("^jasper@2"):
filter_file("image.inmem_=1;", "", "external/g2clib-1.6.0/enc_jpeg2000.c")
filter_file("SUBDIRS = ", "SUBDIRS = g2clib-1.6.0 ", "external/yMakefile")
filter_file(
"INC=.*",
"INC=%s" % self.spec["jasper"].prefix.include,
"external/g2clib-1.6.0/makefile",
)
def install(self, spec, prefix): def install(self, spec, prefix):
if (self.compiler.fc is None) or (self.compiler.cc is None): if (self.compiler.fc is None) or (self.compiler.cc is None):
@@ -398,16 +406,3 @@ def delete_files(*filenames):
os.remove(filename) os.remove(filename)
except OSError as e: except OSError as e:
raise InstallError("Failed to delete file %s: %s" % (e.filename, e.strerror)) raise InstallError("Failed to delete file %s: %s" % (e.filename, e.strerror))
@when("+grib")
def patch(self):
# Newer versions of libjasper do not provide the inmem property
if self.spec.satisfies("^jasper@2"):
filter_file("image.inmem_=1;", "", "external/g2clib-1.6.0/enc_jpeg2000.c")
filter_file("SUBDIRS = ", "SUBDIRS = g2clib-1.6.0 ", "external/yMakefile")
filter_file(
"INC=.*",
"INC=%s" % self.spec["jasper"].prefix.include,
"external/g2clib-1.6.0/makefile",
)