Merge branch 'develop' into features/newarch
This commit is contained in:
commit
f3f0122f11
3 changed files with 12 additions and 7 deletions
|
@ -2150,10 +2150,13 @@ def __init__(self):
|
|||
(r'\s+', lambda scanner, val: None)])
|
||||
|
||||
|
||||
# Lexer is always the same for every parser.
|
||||
_lexer = SpecLexer()
|
||||
|
||||
class SpecParser(spack.parse.Parser):
|
||||
|
||||
def __init__(self):
|
||||
super(SpecParser, self).__init__(SpecLexer())
|
||||
super(SpecParser, self).__init__(_lexer)
|
||||
self.previous = None
|
||||
|
||||
def do_parse(self):
|
||||
|
|
|
@ -30,9 +30,13 @@ class Dealii(Package):
|
|||
"""C++ software library providing well-documented tools to build finite
|
||||
element codes for a broad variety of PDEs."""
|
||||
homepage = "https://www.dealii.org"
|
||||
url = "https://github.com/dealii/dealii/releases/download/v8.4.0/dealii-8.4.0.tar.gz"
|
||||
url = "https://github.com/dealii/dealii/releases/download/v8.4.1/dealii-8.4.1.tar.gz"
|
||||
|
||||
version('8.4.1', 'efbaf16f9ad59cfccad62302f36c3c1d')
|
||||
version('8.4.0', 'ac5dbf676096ff61e092ce98c80c2b00')
|
||||
version('8.3.0', 'fc6cdcb16309ef4bea338a4f014de6fa')
|
||||
version('8.2.1', '71c728dbec14f371297cd405776ccf08')
|
||||
version('8.1.0', 'aa8fadc2ce5eb674f44f997461bf668d')
|
||||
version('dev', git='https://github.com/dealii/dealii.git')
|
||||
|
||||
variant('mpi', default=True, description='Compile with MPI')
|
||||
|
|
|
@ -41,12 +41,10 @@ class Libdwarf(Package):
|
|||
MIPS/IRIX C compiler."""
|
||||
|
||||
homepage = "http://www.prevanders.net/dwarf.html"
|
||||
url = "http://www.prevanders.net/libdwarf-20130729.tar.gz"
|
||||
url = "http://www.prevanders.net/libdwarf-20160507.tar.gz"
|
||||
list_url = homepage
|
||||
|
||||
version('20130729', '4cc5e48693f7b93b7aa0261e63c0e21d')
|
||||
version('20130207', '64b42692e947d5180e162e46c689dfbf')
|
||||
version('20130126', 'ded74a5e90edb5a12aac3c29d260c5db')
|
||||
version('20160507', 'ae32d6f9ece5daf05e2d4b14822ea811')
|
||||
|
||||
depends_on("libelf")
|
||||
|
||||
|
@ -69,7 +67,7 @@ def install(self, spec, prefix):
|
|||
install('libdwarf.h', prefix.include)
|
||||
install('dwarf.h', prefix.include)
|
||||
|
||||
with working_dir('dwarfdump2'):
|
||||
with working_dir('dwarfdump'):
|
||||
configure("--prefix=" + prefix)
|
||||
|
||||
# This makefile has strings of copy commands that
|
||||
|
|
Loading…
Reference in a new issue