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

Revert "XorgPackage, glx: conflicts windows and darwin (#50216)" (#50231)

Browse Source 
This reverts commit 382847976f.
This commit is contained in:
Wouter Deconinck 2025-04-29 09:09:40 -05:00 committed by GitHub
parent a6b0dfbd53
commit b9b7450f60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/spack/build_systems/xorg.py
View File

@ -6,17 +6,12 @@
import spack.package_base import spack.package_base
import spack.util.url import spack.util.url
from spack.directives import conflicts
class XorgPackage(spack.package_base.PackageBase): class XorgPackage(spack.package_base.PackageBase):
"""Mixin that takes care of setting url and mirrors for x.org """Mixin that takes care of setting url and mirrors for x.org
packages.""" packages."""
# x.org packages are not supported on windows or darwin
conflicts("platform=windows")
conflicts("platform=darwin")
#: Path of the package in a x.org mirror #: Path of the package in a x.org mirror
xorg_mirror_path: Optional[str] = None xorg_mirror_path: Optional[str] = None

3
var/spack/repos/builtin/packages/glx/package.py
View File

@ -12,9 +12,6 @@ class Glx(BundlePackage):
version("1.4") version("1.4")
conflicts("platform=windows")
conflicts("platform=darwin")
depends_on("libglx") depends_on("libglx")
provides("gl@4.5") provides("gl@4.5")