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

freeglut: added v3.2.1 and patch to build with GCC 10 (#18229)

Browse Source
This commit is contained in:
Joseph Wang 2020-08-25 15:53:27 +08:00 committed by GitHub
parent c13bc308db
commit ac6d7dcdf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/freeglut/common-gcc10.patch Normal file
View File

@ -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")

6
var/spack/repos/builtin/packages/freeglut/package.py
View File

@ -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')