diff options
| author | Michael Kuhn <suraia@ikkoku.de> | 2017-07-02 15:05:09 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-07-02 08:05:09 -0500 |
| commit | a88e93852dd6660a2c03c87e4b4b7d7852312aca (patch) | |
| tree | 17fe050ea40acf75b735c0bfe803ad3296cac84e /var | |
| parent | 51ee9a1a6b6869e496a72c0e1effab2927ae2365 (diff) | |
| download | spack-a88e93852dd6660a2c03c87e4b4b7d7852312aca.tar.gz spack-a88e93852dd6660a2c03c87e4b4b7d7852312aca.tar.bz2 spack-a88e93852dd6660a2c03c87e4b4b7d7852312aca.tar.xz spack-a88e93852dd6660a2c03c87e4b4b7d7852312aca.zip | |
antlr: Use official sources (#4662)
The tarball used until now is not available anymore.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/antlr/gcc.patch | 15 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/antlr/package.py | 21 |
2 files changed, 21 insertions, 15 deletions
diff --git a/var/spack/repos/builtin/packages/antlr/gcc.patch b/var/spack/repos/builtin/packages/antlr/gcc.patch new file mode 100644 index 0000000000..40de6b7861 --- /dev/null +++ b/var/spack/repos/builtin/packages/antlr/gcc.patch @@ -0,0 +1,15 @@ +Description: Adds missing includes to fix FTBFS. + +Index: antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp +=================================================================== +--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100 ++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2009-01-15 20:47:53.000000000 +0100 +@@ -17,6 +17,8 @@ + #else + #include <cctype> + #endif ++#include <cstdio> ++#include <cstring> + + #if ( _MSC_VER == 1200 ) + // VC6 seems to need this diff --git a/var/spack/repos/builtin/packages/antlr/package.py b/var/spack/repos/builtin/packages/antlr/package.py index e6332d20b3..4de61e6b10 100644 --- a/var/spack/repos/builtin/packages/antlr/package.py +++ b/var/spack/repos/builtin/packages/antlr/package.py @@ -32,22 +32,13 @@ class Antlr(AutotoolsPackage): frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees.""" - homepage = "http://www.antlr.org" - url = "https://github.com/antlr/antlr/tarball/v2.7.7" + homepage = "http://www.antlr2.org/" + url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz" - # Notes from http://nco.sourceforge.net/#bld - # The first steps to build (i.e., compile, for the most part) NCO from - # source code are to install the pre-requisites: ANTLR version 2.7.7 - # (like this one not version 3.x or 4.x!) (required for ncap2)... ANTLR - # binaries from major distributions are pre-built with the source patch - # necessary to allow NCO to link to ANTLR... The ANTLR source file - # CharScanner.hpp must include this line: #include <cstring> or else - # ncap2 will not compile (this tarball is already patched). - version('2.7.7', '914865e853fe8e1e61a9f23d045cb4ab', - # Patched version as described above - url='http://dust.ess.uci.edu/tmp/antlr-2.7.7.tar.gz') - # Unpatched version - # url='http://dust.ess.uci.edu/nco/antlr-2.7.7.tar.gz') + version('2.7.7', '01cc9a2a454dd33dcd8c856ec89af090') + + # Fixes build with recent versions of GCC + patch('gcc.patch') variant('cxx', default=True, description='Enable ANTLR for C++') variant('java', default=False, description='Enable ANTLR for Java') |