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

ninja: support tests for 1.12 and later (#48385)

Browse Source 
* ninja: support tests for 1.12:

* ninja: fix style
This commit is contained in:
Wouter Deconinck 2025-01-08 09:57:25 -06:00 committed by GitHub
parent fa9ef0ac89
commit 7e62ca864a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
var/spack/repos/builtin/packages/ninja/package.py
View File

@ -36,13 +36,27 @@ class Ninja(Package):
version("1.7.2", sha256="2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9") version("1.7.2", sha256="2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9")
version("1.6.0", sha256="b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7") version("1.6.0", sha256="b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7")
depends_on("c", type="build") # generated # ninja@1.12: needs googletest source, but 1.12 itself needs a patch to use it
depends_on("cxx", type="build") # generated resource(
name="googletest",
url="https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz",
sha256="81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2",
placement="gtest",
when="@1.12:",
)
patch(
"https://github.com/ninja-build/ninja/commit/f14a949534d673f847c407644441c8f37e130ce9.patch?full_index=1",
sha256="93f4bb3234c3af04e2454c6f0ef2eca3107edd4537a70151ea66f1a1d4c22dad",
when="@1.12",
)
variant( variant(
"re2c", default=not sys.platform == "win32", description="Enable buidling Ninja with re2c" "re2c", default=not sys.platform == "win32", description="Enable buidling Ninja with re2c"
) )
depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
depends_on("python", type="build") depends_on("python", type="build")
depends_on("re2c@0.11.3:", type="build", when="+re2c") depends_on("re2c@0.11.3:", type="build", when="+re2c")
@ -54,6 +68,9 @@ def determine_version(cls, exe):
return output.strip() return output.strip()
def configure(self, spec, prefix): def configure(self, spec, prefix):
if self.run_tests and spec.satisfies("@1.12:"):
python("configure.py", "--bootstrap", "--gtest-source-dir=gtest")
else:
python("configure.py", "--bootstrap") python("configure.py", "--bootstrap")
@run_after("configure") @run_after("configure")