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

qt-*: depends on c (#49766)

Browse Source 
* qt-5compat: depends on c

* qt-*: ensure all depend on C

* qt-base: mv depends_on after variants
This commit is contained in:
Wouter Deconinck 2025-03-28 14:53:28 -05:00 committed by GitHub
parent 7db5b1d5d6
commit 2a25e2b572
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/qt-5compat/package.py
View File

@ -23,6 +23,7 @@ class Qt5compat(QtPackage):
version("6.7.3", sha256="959634d1a6a53f9a483882e81da87ec182ff44d7747a0cc771c786b0f2cf52e0")
version("6.7.2", sha256="331a1e617952217868beeef7964828500388abeeb502ea3436f16eec816426c4")
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("qt-base")

5
var/spack/repos/builtin/packages/qt-base/package.py
View File

@ -170,9 +170,6 @@ class QtBase(QtPackage):
version("6.2.4", sha256="657d1405b5e15afcf322cc75b881f62d6a56f16383707742a99eb87f53cb63de")
version("6.2.3", sha256="2dd095fa82bff9e0feb7a9004c1b2fb910f79ecc6111aa64637c95a02b7a8abb")
depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
variant("dbus", default=False, description="Build with D-Bus support.")
variant(
"framework", default=bool(MACOS_VERSION), description="Build as a macOS Framework package."
@ -194,6 +191,8 @@ class QtBase(QtPackage):
variant("widgets", default=True, when="+gui", description="Build with widgets.")
# Dependencies, then variant- and version-specific dependencies
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("cmake@3.21:", type="build", when="~shared")
depends_on("cmake@3.21:", type="build", when="platform=darwin")
depends_on("double-conversion")

4
var/spack/repos/builtin/packages/qt-declarative/package.py
View File

@ -40,8 +40,8 @@ class QtDeclarative(QtPackage):
version("6.2.4", sha256="cd939d99c37e7723268804b9516e32f8dd64b985d847469c78b66b5f4481c548")
version("6.2.3", sha256="eda82abfe685a6ab5664e4268954622ccd05cc9ec8fb16eaa453c54900591baf")
depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
# Testing requires +network
depends_on("qt-base +network", type="test")

3
var/spack/repos/builtin/packages/qt-quick3d/package.py
View File

@ -40,7 +40,8 @@ class QtQuick3d(QtPackage):
version("6.2.4", sha256="7292ed4373a92913c6811f2faa5191f0426f84bd93a3f6eb7d54b62626b56db5")
version("6.2.3", sha256="35d06edbdd83b7d781b70e0bada18911fa9b774b6403589d5b21813a73584d80")
depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("qt-base +network", when="@6.3.0:")

3
var/spack/repos/builtin/packages/qt-quicktimeline/package.py
View File

@ -40,7 +40,8 @@ class QtQuicktimeline(QtPackage):
version("6.2.4", sha256="d73cb33e33f0b7a1825b863c22e6b552ae86aa841bcb805a41aca02526a4e8bc")
version("6.2.3", sha256="bbb913398d8fb6b5b20993b5e02317de5c1e4b23a5357dd5d08a237ada6cc7e2")
depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
for _v in QtBase.versions:
v = str(_v)

3
var/spack/repos/builtin/packages/qt-shadertools/package.py
View File

@ -42,7 +42,8 @@ class QtShadertools(QtPackage):
version("6.2.4", sha256="c3332d91e0894086634d5f8d40638439e6e3653a3a185e1b5f5d23ae3b9f51a1")
version("6.2.3", sha256="658c4acc2925e57d35bbd38cdf49c08297555ed7d632f9e86bfef76e6d861562")
depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("qt-base +gui")