diff options
author | Seth R. Johnson <johnsonsr@ornl.gov> | 2022-12-05 17:30:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-05 23:30:14 +0100 |
commit | 855d3519b6c90fee288a8fc2a4a8098eb5ae8494 (patch) | |
tree | 4ffd57f55f6b3ccca2f74bf836d8e5b58564c7c8 /var | |
parent | 37f232e3199c179aa3115493b48326f9c0d5129c (diff) | |
download | spack-855d3519b6c90fee288a8fc2a4a8098eb5ae8494.tar.gz spack-855d3519b6c90fee288a8fc2a4a8098eb5ae8494.tar.bz2 spack-855d3519b6c90fee288a8fc2a4a8098eb5ae8494.tar.xz spack-855d3519b6c90fee288a8fc2a4a8098eb5ae8494.zip |
SWIG: new version 4.1.0 (#34250)
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/sensei/package.py | 5 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/swig/package.py | 48 |
2 files changed, 39 insertions, 14 deletions
diff --git a/var/spack/repos/builtin/packages/sensei/package.py b/var/spack/repos/builtin/packages/sensei/package.py index b2f5403205..e512b6db59 100644 --- a/var/spack/repos/builtin/packages/sensei/package.py +++ b/var/spack/repos/builtin/packages/sensei/package.py @@ -100,6 +100,11 @@ class Sensei(CMakePackage): patch("sensei-find-mpi-component-cxx-pr68.patch", when="@4.0.0") patch("sensei-install-external-pugixml-pr69.patch", when="@4.0.0") patch("sensei-version-detection-pr75.patch", when="@4.0.0") + patch( + "https://patch-diff.githubusercontent.com/raw/SENSEI-insitu/SENSEI/pull/88.patch?full_index=1", + sha256="6e5a190d4d3275c248b11b9258b79ddf2e5f0dc1b028b23dcdbdc13f9ea46813", + when="@4.0.0 +python ^swig@4.1:", + ) def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py index 96ad9847af..674894e43b 100644 --- a/var/spack/repos/builtin/packages/swig/package.py +++ b/var/spack/repos/builtin/packages/swig/package.py @@ -29,10 +29,12 @@ class Swig(AutotoolsPackage, SourceforgePackage): version("master", git="https://github.com/swig/swig.git") version( - "4.0.2", - sha256="d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc", + "4.1.1", + sha256="2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b", preferred=True, ) + version("4.1.0", sha256="d6a9a8094e78f7cfb6f80a73cc271e1fe388c8638ed22668622c2c646df5bb3d") + version("4.0.2", sha256="d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc") version("4.0.1", sha256="7a00b4d0d53ad97a14316135e2d702091cd5f193bb58bcfcd8bc59d41e7887a9") version("4.0.0", sha256="e8a39cd6437e342cdcbd5af27a9bf11b62dc9efec9248065debcb8276fcbb925") version("3.0.12", sha256="7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d") @@ -45,6 +47,16 @@ class Swig(AutotoolsPackage, SourceforgePackage): version("1.3.40", sha256="1945b3693bcda6777bd05fef1015a0ad1a4604cde4a4a0a368b61ccfd143ac09") version("fortran", branch="master", git="https://github.com/swig-fortran/swig.git") version( + "4.1.1-fortran", + sha256="417ea6adde3e6bf7825b2f670d2eac36257cc50db0e2f84c5bd4d67a16a7e88f", + url="https://github.com/swig-fortran/swig/archive/refs/tags/v4.1.1+fortran.tar.gz", + ) + version( + "4.1.0-fortran", + sha256="f15521b10e7ef3b2a41dd0d81de0b1355a94495e481d201db4247e073a6f2d9b", + url="https://github.com/swig-fortran/swig/archive/refs/tags/v4.1.0+fortran.tar.gz", + ) + version( "4.1.dev1-fortran", sha256="d9020319771879b41f9545e95f9d252a3ffc379832dded14c385e5cd823e526d", url="https://github.com/swig-fortran/swig/archive/refs/tags/v4.1.0-dev1+fortran.tar.gz", @@ -55,17 +67,27 @@ class Swig(AutotoolsPackage, SourceforgePackage): url="https://github.com/swig-fortran/swig/archive/v4.0.2+fortran.tar.gz", ) - depends_on("pcre") + depends_on("pcre", when="@:4.0") + depends_on("pcre2", when="@4.1:") depends_on("zlib") - AUTOCONF_VERSIONS = ["@master", "@fortran", "@4.0.2-fortran", "@4.1.dev1-fortran"] + AUTOCONF_VERSIONS = "@" + ",".join( + [ + "master", + "fortran", + "4.0.2-fortran", + "4.1.dev1-fortran", + "4.1.0-fortran", + "4.1.1-fortran", + ] + ) # Git releases do *not* include configure script - for _version in AUTOCONF_VERSIONS: - depends_on("autoconf", type="build", when=_version) - depends_on("automake", type="build", when=_version) - depends_on("libtool", type="build", when=_version) - depends_on("yacc", type="build", when=_version) + depends_on("autoconf", type="build", when=AUTOCONF_VERSIONS) + depends_on("automake", type="build", when=AUTOCONF_VERSIONS) + depends_on("libtool", type="build", when=AUTOCONF_VERSIONS) + depends_on("yacc", type="build", when=AUTOCONF_VERSIONS) + # Need newer 'automake' to support newer platforms for _target in ["ppc64le", "aarch64"]: depends_on("automake@1.15:", type="build", when="target={0}:".format(_target)) @@ -132,8 +154,6 @@ class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder): with working_dir(self.prefix.bin): os.symlink("swig", "swig{0}".format(self.spec.version.up_to(2))) - for _version in Swig.AUTOCONF_VERSIONS: - - @when(_version) - def autoreconf(self, pkg, spec, prefix): - which("sh")("./autogen.sh") + @when(Swig.AUTOCONF_VERSIONS) + def autoreconf(self, pkg, spec, prefix): + which("sh")("./autogen.sh") |