diff options
| author | Eric Berquist <ejberqu@sandia.gov> | 2024-02-15 23:27:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-15 22:27:07 -0600 |
| commit | 55b62c2168ff289ccf42b0b48d221c931949071f (patch) | |
| tree | 7b79dacefbcc4f9e224ac1fdd49f3437cb1c492c | |
| parent | 6c3511ee1d04e3a0003e125471e80d85e110d0b1 (diff) | |
| download | spack-55b62c2168ff289ccf42b0b48d221c931949071f.tar.gz spack-55b62c2168ff289ccf42b0b48d221c931949071f.tar.bz2 spack-55b62c2168ff289ccf42b0b48d221c931949071f.tar.xz spack-55b62c2168ff289ccf42b0b48d221c931949071f.zip | |
SST: only run autoreconf for versions from Git branches (#42712)
| -rw-r--r-- | var/spack/repos/builtin/packages/sst-core/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/sst-elements/package.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/sst-macro/package.py | 10 |
3 files changed, 19 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/sst-core/package.py b/var/spack/repos/builtin/packages/sst-core/package.py index cc8931be35..dc41ee0795 100644 --- a/var/spack/repos/builtin/packages/sst-core/package.py +++ b/var/spack/repos/builtin/packages/sst-core/package.py @@ -69,16 +69,18 @@ class SstCore(AutotoolsPackage): depends_on("zoltan", when="+zoltan") depends_on("hdf5", when="+hdf5") depends_on("zlib-api", when="+zlib") - - depends_on("autoconf@1.68:", type="build") - depends_on("automake@1.11.1:", type="build") - depends_on("libtool@1.2.4:", type="build") - depends_on("m4", type="build", when="@master:") depends_on("gettext") + for version_name in ("master", "develop"): + depends_on("autoconf@1.68:", type="build", when="@{}".format(version_name)) + depends_on("automake@1.11.1:", type="build", when="@{}".format(version_name)) + depends_on("libtool@1.2.4:", type="build", when="@{}".format(version_name)) + depends_on("m4", type="build", when="@{}".format(version_name)) + # force out-of-source builds build_directory = "spack-build" + @when("@develop,master") def autoreconf(self, spec, prefix): bash = which("bash") bash("autogen.sh") diff --git a/var/spack/repos/builtin/packages/sst-elements/package.py b/var/spack/repos/builtin/packages/sst-elements/package.py index be4125fb9c..93f621c607 100644 --- a/var/spack/repos/builtin/packages/sst-elements/package.py +++ b/var/spack/repos/builtin/packages/sst-elements/package.py @@ -81,10 +81,11 @@ class SstElements(AutotoolsPackage): depends_on("gettext") depends_on("zlib-api") - depends_on("autoconf@1.68:", type="build") - depends_on("automake@1.11.1:", type="build") - depends_on("libtool@1.2.4:", type="build") - depends_on("m4", type="build") + for version_name in ("master", "develop"): + depends_on("autoconf@1.68:", type="build", when="@{}".format(version_name)) + depends_on("automake@1.11.1:", type="build", when="@{}".format(version_name)) + depends_on("libtool@1.2.4:", type="build", when="@{}".format(version_name)) + depends_on("m4", type="build", when="@{}".format(version_name)) conflicts("+dumpi", msg="Dumpi not currently supported, contact SST Developers for help") conflicts("+otf", msg="OTF not currently supported, contact SST Developers for help") @@ -102,6 +103,7 @@ class SstElements(AutotoolsPackage): # force out-of-source builds build_directory = "spack-build" + @when("@develop,master") def autoreconf(self, spec, prefix): bash = which("bash") bash("autogen.sh") diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index 5cb45ec347..c04358ab06 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -42,10 +42,11 @@ class SstMacro(AutotoolsPackage): version("master", branch="master") version("develop", branch="devel") - depends_on("autoconf@1.68:", type="build", when="@master:") - depends_on("automake@1.11.1:", type="build", when="@master:") - depends_on("libtool@1.2.4:", type="build", when="@master:") - depends_on("m4", type="build", when="@master:") + for version_name in ("master", "develop"): + depends_on("autoconf@1.68:", type="build", when="@{}".format(version_name)) + depends_on("automake@1.11.1:", type="build", when="@{}".format(version_name)) + depends_on("libtool@1.2.4:", type="build", when="@{}".format(version_name)) + depends_on("m4", type="build", when="@{}".format(version_name)) depends_on("binutils", type="build") depends_on("zlib-api", type=("build", "link")) @@ -75,6 +76,7 @@ class SstMacro(AutotoolsPackage): # force out-of-source builds build_directory = "spack-build" + @when("@develop,master") def autoreconf(self, spec, prefix): bash = which("bash") bash("./bootstrap.sh") |