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

SST: only run autoreconf for versions from Git branches (#42712)

Browse Source
This commit is contained in:
Eric Berquist 2024-02-15 23:27:07 -05:00 committed by GitHub
parent 6c3511ee1d
commit 55b62c2168
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/sst-core/package.py
View File

@ -69,16 +69,18 @@ class SstCore(AutotoolsPackage):
depends_on("zoltan", when="+zoltan") depends_on("zoltan", when="+zoltan")
depends_on("hdf5", when="+hdf5") depends_on("hdf5", when="+hdf5")
depends_on("zlib-api", when="+zlib") 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") 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 # force out-of-source builds
build_directory = "spack-build" build_directory = "spack-build"
@when("@develop,master")
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
bash = which("bash") bash = which("bash")
bash("autogen.sh") bash("autogen.sh")

10
var/spack/repos/builtin/packages/sst-elements/package.py
View File

@ -81,10 +81,11 @@ class SstElements(AutotoolsPackage):
depends_on("gettext") depends_on("gettext")
depends_on("zlib-api") depends_on("zlib-api")
depends_on("autoconf@1.68:", type="build") for version_name in ("master", "develop"):
depends_on("automake@1.11.1:", type="build") depends_on("autoconf@1.68:", type="build", when="@{}".format(version_name))
depends_on("libtool@1.2.4:", type="build") depends_on("automake@1.11.1:", type="build", when="@{}".format(version_name))
depends_on("m4", type="build") 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("+dumpi", msg="Dumpi not currently supported, contact SST Developers for help")
conflicts("+otf", msg="OTF 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 # force out-of-source builds
build_directory = "spack-build" build_directory = "spack-build"
@when("@develop,master")
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
bash = which("bash") bash = which("bash")
bash("autogen.sh") bash("autogen.sh")

10
var/spack/repos/builtin/packages/sst-macro/package.py
View File

@ -42,10 +42,11 @@ class SstMacro(AutotoolsPackage):
version("master", branch="master") version("master", branch="master")
version("develop", branch="devel") version("develop", branch="devel")
depends_on("autoconf@1.68:", type="build", when="@master:") for version_name in ("master", "develop"):
depends_on("automake@1.11.1:", type="build", when="@master:") depends_on("autoconf@1.68:", type="build", when="@{}".format(version_name))
depends_on("libtool@1.2.4:", type="build", when="@master:") depends_on("automake@1.11.1:", type="build", when="@{}".format(version_name))
depends_on("m4", type="build", when="@master:") 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("binutils", type="build")
depends_on("zlib-api", type=("build", "link")) depends_on("zlib-api", type=("build", "link"))
@ -75,6 +76,7 @@ class SstMacro(AutotoolsPackage):
# force out-of-source builds # force out-of-source builds
build_directory = "spack-build" build_directory = "spack-build"
@when("@develop,master")
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
bash = which("bash") bash = which("bash")
bash("./bootstrap.sh") bash("./bootstrap.sh")