summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHadrien G <knights_of_ni@gmx.com>2018-07-26 22:54:46 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2018-07-26 15:54:46 -0500
commitc03dcdedb183f6aa4a8680a0c04d48e7a4d520a8 (patch)
tree66496a0a1601210c3636da9af114befaf2821fc4
parent61aa1831e3d93a51abf38591d795e5507195c6c5 (diff)
downloadspack-c03dcdedb183f6aa4a8680a0c04d48e7a4d520a8.tar.gz
spack-c03dcdedb183f6aa4a8680a0c04d48e7a4d520a8.tar.bz2
spack-c03dcdedb183f6aa4a8680a0c04d48e7a4d520a8.tar.xz
spack-c03dcdedb183f6aa4a8680a0c04d48e7a4d520a8.zip
FTGL package workarounds (#8812)
* FTGL package workarounds * Remove blank line * Only require doxygen at build time
-rw-r--r--var/spack/repos/builtin/packages/ftgl/package.py10
-rw-r--r--var/spack/repos/builtin/packages/ftgl/remove-extra-qualifier.diff11
2 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/ftgl/package.py b/var/spack/repos/builtin/packages/ftgl/package.py
index 95e968e371..a2fcb7c702 100644
--- a/var/spack/repos/builtin/packages/ftgl/package.py
+++ b/var/spack/repos/builtin/packages/ftgl/package.py
@@ -37,6 +37,9 @@ class Ftgl(AutotoolsPackage):
version('2.1.2', 'f81c0a7128192ba11e036186f9a968f2')
+ # There is an unnecessary qualifier around, which makes modern GCC sad
+ patch('remove-extra-qualifier.diff')
+
# Ftgl does not come with a configure script
depends_on('autoconf', type='build')
depends_on('automake', type='build')
@@ -48,6 +51,13 @@ class Ftgl(AutotoolsPackage):
depends_on('glu')
depends_on('freetype@2.0.9:')
+ # Currently, "make install" will fail if the docs weren't built
+ #
+ # FIXME: Can someone with autotools experience fix the build system
+ # so that it doesn't fail when that happens?
+ #
+ depends_on('doxygen', type='build')
+
@property
@when('@2.1.2')
def configure_directory(self):
diff --git a/var/spack/repos/builtin/packages/ftgl/remove-extra-qualifier.diff b/var/spack/repos/builtin/packages/ftgl/remove-extra-qualifier.diff
new file mode 100644
index 0000000000..cff9a3836e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ftgl/remove-extra-qualifier.diff
@@ -0,0 +1,11 @@
+--- FTGL/include/FTTextureGlyph.h 2018-07-26 08:30:55.144488976 +0000
++++ FTGL/include/FTTextureGlyph.h 2018-07-26 08:29:42.072489186 +0000
+@@ -52,7 +52,7 @@
+ * Reset the currently active texture to zero to get into a known state before
+ * drawing a string. This is to get round possible threading issues.
+ */
+- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
++ static void ResetActiveTexture(){ activeTextureID = 0;}
+
+ private:
+ /**