diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2022-05-17 13:19:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-17 10:19:19 -0700 |
| commit | b9e3ee6dd07710f2a377e1624d1665da65ca834b (patch) | |
| tree | 6ed6aca79a81a9899416d0c28a217d9ebb0dcc56 /var | |
| parent | 10ea0a2a3e0cca02eeee57672474c3b4f7268582 (diff) | |
| download | spack-b9e3ee6dd07710f2a377e1624d1665da65ca834b.tar.gz spack-b9e3ee6dd07710f2a377e1624d1665da65ca834b.tar.bz2 spack-b9e3ee6dd07710f2a377e1624d1665da65ca834b.tar.xz spack-b9e3ee6dd07710f2a377e1624d1665da65ca834b.zip | |
glew: Fix glu and glx dependencies (#30705)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/glew/package.py | 24 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/glew/remove-pkgconfig-glu-dep.patch | 18 |
2 files changed, 33 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/glew/package.py b/var/spack/repos/builtin/packages/glew/package.py index 24c7da7a1a..6202f89da6 100644 --- a/var/spack/repos/builtin/packages/glew/package.py +++ b/var/spack/repos/builtin/packages/glew/package.py @@ -9,18 +9,24 @@ class Glew(CMakePackage): homepage = "http://glew.sourceforge.net/" url = "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz" + root_cmakelists_dir = "build/cmake" + version('2.2.0', sha256='d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1') version('2.1.0', sha256='04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95') version('2.0.0', sha256='c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764') - depends_on("gl") # glu is optional if -DGLEW_NO_GLU is used by dependents - depends_on('libsm') - depends_on('libice') + depends_on('gl') + depends_on('glx', when='platform=linux') - root_cmakelists_dir = "build/cmake" + # glu is already forcibly disabled in the CMakeLists.txt. This prevents + # it from showing up in the .pc file + patch('remove-pkgconfig-glu-dep.patch') + + def cmake_args(self): + args = [ + self.define('BUILD_UTILS', True), + self.define('GLEW_REGAL', False), + self.define('GLEW_OSMESA', False), + ] - @run_after('cmake') - def patch_glew_pc(self): - # https://github.com/Homebrew/legacy-homebrew/issues/22025 - # Note: This file is generated only after cmake is run - filter_file(r'Requires: glu', '', 'glew.pc') + return args diff --git a/var/spack/repos/builtin/packages/glew/remove-pkgconfig-glu-dep.patch b/var/spack/repos/builtin/packages/glew/remove-pkgconfig-glu-dep.patch new file mode 100644 index 0000000000..74710e0276 --- /dev/null +++ b/var/spack/repos/builtin/packages/glew/remove-pkgconfig-glu-dep.patch @@ -0,0 +1,18 @@ +diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt +index 419c243..339617f 100644 +--- a/build/cmake/CMakeLists.txt ++++ b/build/cmake/CMakeLists.txt +@@ -215,12 +215,7 @@ set (includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) + set (version ${GLEW_VERSION}) + set (libname ${GLEW_LIB_NAME}) + set (cflags) +-set (requireslib glu) +- +-# Mac OSX has no glu.pc unless optional X11/GLX is installed +-if (APPLE) +- set (requireslib) +-endif () ++set (requireslib) + + configure_file (${GLEW_DIR}/glew.pc.in ${CMAKE_CURRENT_BINARY_DIR}/glew.pc @ONLY) + |