diff options
| author | Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> | 2022-04-19 10:22:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-19 10:22:32 +0200 |
| commit | 0ce88521ce5893373b7484abd1d3d0843827d5b6 (patch) | |
| tree | 402c7de44ec07e6fccae5f91ecbdd3c3e2623e2a | |
| parent | aac7176924d5d297da9ee4c87d3d785f8d575c47 (diff) | |
| download | spack-0ce88521ce5893373b7484abd1d3d0843827d5b6.tar.gz spack-0ce88521ce5893373b7484abd1d3d0843827d5b6.tar.bz2 spack-0ce88521ce5893373b7484abd1d3d0843827d5b6.tar.xz spack-0ce88521ce5893373b7484abd1d3d0843827d5b6.zip | |
glew,vapor: Move depends_on("glu") from glew to vapor (#30112)
In #26630, I assumed "glu" was needed by glew because it included glu.h, but
actually, glew can be used without glu when GLEW_NO_GLU is defined and this
is documented in the announcement of glew-1.6.0:
> https://www.geeks3d.com/20110430/opengl-glew-1-6-0-available/
> * Define GLEW_NO_GLU for no glu dependency
It is therefore the duty of users of glew to decide if they use glu,
and then they need to have a depends_on("glu").
Thus, move the depends_on("glu") which I changed from "gl" in #26630
to vapor, which itself uses glu as well.
| -rw-r--r-- | var/spack/repos/builtin/packages/glew/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/vapor/package.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/glew/package.py b/var/spack/repos/builtin/packages/glew/package.py index 0646859e85..24c7da7a1a 100644 --- a/var/spack/repos/builtin/packages/glew/package.py +++ b/var/spack/repos/builtin/packages/glew/package.py @@ -13,7 +13,7 @@ class Glew(CMakePackage): version('2.1.0', sha256='04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95') version('2.0.0', sha256='c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764') - depends_on("glu") + depends_on("gl") # glu is optional if -DGLEW_NO_GLU is used by dependents depends_on('libsm') depends_on('libice') diff --git a/var/spack/repos/builtin/packages/vapor/package.py b/var/spack/repos/builtin/packages/vapor/package.py index a58e6aafba..8e83541905 100644 --- a/var/spack/repos/builtin/packages/vapor/package.py +++ b/var/spack/repos/builtin/packages/vapor/package.py @@ -21,7 +21,7 @@ class Vapor(CMakePackage): version('3.5.0', sha256='f055d488c6f5bda5174a63990b6b6600037f7ce73ac68d39ad0f371d67f2d685') version('3.3.0', sha256='41c13d206cfcfa4146155d524106de2eb74e7b59af1e2f8c1c3056c15d508a93') - depends_on('gl') # GUI + depends_on('glu') # GUI depends_on('qt@5.13.2:+opengl+dbus') # GUI depends_on('netcdf-c@4.7.0:') depends_on('udunits@2.2.26:') |