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

root: fix X11 and OpenGL-related issues on macOS (#45632)

Browse Source 
* root: Add dependency on libglx

We have been trying to build the Acts package on MacOS, and in this
process we have been running into problems with the ROOT spec on that
operating system; the primary issue we are encountering is that the
compiler is unable to find the `GL/glx.h` header, which is part of glx.
It seems, therefore, that ROOT depends on libglx, but this is not
currently encoded in the spec. This commit ensures that ROOT depends on
the virtual libglx package when both the OpenCL and X11 variants are
enabled.

* Enable builtin glew on MacOS

* Allow `root+opengl+aqua~x` on macOS
This commit is contained in:
Stephen Nicholas Swatman 2024-09-03 15:32:17 +02:00 committed by GitHub
parent 9e18e63053
commit 5c297d8322
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/root/package.py
View File

@ -336,6 +336,7 @@ class Root(CMakePackage):
depends_on("gl2ps", when="+opengl")
depends_on("gl", when="+opengl")
depends_on("glu", when="+opengl")
depends_on("libglx", when="+opengl+x")
# Qt4
depends_on("qt@:4", when="+qt4")
@ -419,7 +420,9 @@ class Root(CMakePackage):
conflicts("target=ppc64le:", when="@:6.24")
# Incompatible variants
if sys.platform != "darwin":
if sys.platform == "darwin":
conflicts("+opengl", when="~x ~aqua", msg="root+opengl requires X or Aqua")
else:
conflicts("+opengl", when="~x", msg="root+opengl requires X")
conflicts("+math", when="~gsl", msg="root+math requires GSL")
conflicts("+tmva", when="~gsl", msg="root+tmva requires GSL")
@ -607,7 +610,7 @@ def cmake_args(self):
define("builtin_freetype", False),
define("builtin_ftgl", False),
define("builtin_gl2ps", False),
define("builtin_glew", False),
define("builtin_glew", self.spec.satisfies("platform=darwin")),
define("builtin_gsl", False),
define("builtin_llvm", True),
define("builtin_lz4", self.spec.satisfies("@6.12.02:6.12")),