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

glew,vapor: Move depends_on("glu") from glew to vapor (#30112)

Browse Source 
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.
This commit is contained in:
Bernhard Kaindl 2022-04-19 10:22:32 +02:00 committed by GitHub
parent aac7176924
commit 0ce88521ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/glew/package.py
View File

@ -13,7 +13,7 @@ class Glew(CMakePackage):
version('2.1.0', sha256='04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95') version('2.1.0', sha256='04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95')
version('2.0.0', sha256='c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764') 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('libsm')
depends_on('libice') depends_on('libice')

2
var/spack/repos/builtin/packages/vapor/package.py
View File

@ -21,7 +21,7 @@ class Vapor(CMakePackage):
version('3.5.0', sha256='f055d488c6f5bda5174a63990b6b6600037f7ce73ac68d39ad0f371d67f2d685') version('3.5.0', sha256='f055d488c6f5bda5174a63990b6b6600037f7ce73ac68d39ad0f371d67f2d685')
version('3.3.0', sha256='41c13d206cfcfa4146155d524106de2eb74e7b59af1e2f8c1c3056c15d508a93') 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('qt@5.13.2:+opengl+dbus') # GUI
depends_on('netcdf-c@4.7.0:') depends_on('netcdf-c@4.7.0:')
depends_on('udunits@2.2.26:') depends_on('udunits@2.2.26:')