diff options
| author | Joseph Wang <joequant@gmail.com> | 2020-08-25 15:53:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 09:53:27 +0200 |
| commit | ac6d7dcdf6f92b571469d3945f35a6f79e6d2b03 (patch) | |
| tree | 1f9e57996a97810829767a7f112eb67a5c6f8fda | |
| parent | c13bc308db35928860a2d03a17f2fd432459d9ec (diff) | |
| download | spack-ac6d7dcdf6f92b571469d3945f35a6f79e6d2b03.tar.gz spack-ac6d7dcdf6f92b571469d3945f35a6f79e6d2b03.tar.bz2 spack-ac6d7dcdf6f92b571469d3945f35a6f79e6d2b03.tar.xz spack-ac6d7dcdf6f92b571469d3945f35a6f79e6d2b03.zip | |
freeglut: added v3.2.1 and patch to build with GCC 10 (#18229)
| -rw-r--r-- | var/spack/repos/builtin/packages/freeglut/common-gcc10.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/freeglut/package.py | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/freeglut/common-gcc10.patch b/var/spack/repos/builtin/packages/freeglut/common-gcc10.patch new file mode 100644 index 0000000000..bae4632601 --- /dev/null +++ b/var/spack/repos/builtin/packages/freeglut/common-gcc10.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2019-09-25 15:43:34.000000000 -0500 ++++ b/CMakeLists.txt 2020-01-31 09:26:24.104743210 -0600 +@@ -302,7 +302,7 @@ + ENDIF() + + IF(CMAKE_COMPILER_IS_GNUCC) +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fcommon") + IF(NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) + # not setting -ansi as EGL/KHR headers doesn't support it + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic") diff --git a/var/spack/repos/builtin/packages/freeglut/package.py b/var/spack/repos/builtin/packages/freeglut/package.py index 2d890534f4..b28808f957 100644 --- a/var/spack/repos/builtin/packages/freeglut/package.py +++ b/var/spack/repos/builtin/packages/freeglut/package.py @@ -11,10 +11,10 @@ class Freeglut(CMakePackage, SourceforgePackage): Utility Toolkit (GLUT) library""" homepage = "http://freeglut.sourceforge.net/" - sourceforge_mirror_path = "freeglut/freeglut-3.0.0.tar.gz" - + sourceforge_mirror_path = "freeglut/freeglut-3.2.1.tar.gz" + version('3.2.1', sha256='d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68') version('3.0.0', sha256='2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2') - + patch('common-gcc10.patch', when="@3.2.1: %gcc@10.0:") depends_on('gl') depends_on('glu') depends_on('libx11') |