From b9b7450f604e1618b24f92d5ab61138f81b223c9 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 29 Apr 2025 09:09:40 -0500 Subject: [PATCH] Revert "XorgPackage, glx: conflicts windows and darwin (#50216)" (#50231) This reverts commit 382847976f0dd1d50ee1ae120f4575ba30084587. --- lib/spack/spack/build_systems/xorg.py | 5 ----- var/spack/repos/builtin/packages/glx/package.py | 3 --- 2 files changed, 8 deletions(-) diff --git a/lib/spack/spack/build_systems/xorg.py b/lib/spack/spack/build_systems/xorg.py index 47ba83d21a3..131444cbb5e 100644 --- a/lib/spack/spack/build_systems/xorg.py +++ b/lib/spack/spack/build_systems/xorg.py @@ -6,17 +6,12 @@ import spack.package_base import spack.util.url -from spack.directives import conflicts class XorgPackage(spack.package_base.PackageBase): """Mixin that takes care of setting url and mirrors for x.org 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 xorg_mirror_path: Optional[str] = None diff --git a/var/spack/repos/builtin/packages/glx/package.py b/var/spack/repos/builtin/packages/glx/package.py index 22918f0eade..5ce00b79bf2 100644 --- a/var/spack/repos/builtin/packages/glx/package.py +++ b/var/spack/repos/builtin/packages/glx/package.py @@ -12,9 +12,6 @@ class Glx(BundlePackage): version("1.4") - conflicts("platform=windows") - conflicts("platform=darwin") - depends_on("libglx") provides("gl@4.5")