diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-24 10:48:29 +0900 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-24 10:48:29 +0900 |
| commit | 93a746043cba256ecf8fe84d543be985eb69b651 (patch) | |
| tree | aa2eae315bfa6546705dfff2695e74c6cea632a6 | |
| parent | 97c3854c4044a71cf756d9164684fa553915f6ab (diff) | |
| parent | 5c8dd6c3c86400ac82b061ce45f58b543526bfff (diff) | |
| download | spack-93a746043cba256ecf8fe84d543be985eb69b651.tar.gz spack-93a746043cba256ecf8fe84d543be985eb69b651.tar.bz2 spack-93a746043cba256ecf8fe84d543be985eb69b651.tar.xz spack-93a746043cba256ecf8fe84d543be985eb69b651.zip | |
Merge pull request #450 from trws/llvm-trunk
llvm trunk version
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 1805d3ded8..a8f19f9071 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -118,6 +118,21 @@ class Llvm(Package): } releases = [ { + 'version' : 'trunk', + 'repo' : 'http://llvm.org/svn/llvm-project/llvm/trunk', + 'resources' : { + 'compiler-rt' : 'http://llvm.org/svn/llvm-project/compiler-rt/trunk', + 'openmp' : 'http://llvm.org/svn/llvm-project/openmp/trunk', + 'polly' : 'http://llvm.org/svn/llvm-project/polly/trunk', + 'libcxx' : 'http://llvm.org/svn/llvm-project/libcxx/trunk', + 'libcxxabi' : 'http://llvm.org/svn/llvm-project/libcxxabi/trunk', + 'clang' : 'http://llvm.org/svn/llvm-project/cfe/trunk', + 'clang-tools-extra' : 'http://llvm.org/svn/llvm-project/clang-tools-extra/trunk', + 'lldb' : 'http://llvm.org/svn/llvm-project/lldb/trunk', + 'llvm-libunwind' : 'http://llvm.org/svn/llvm-project/libunwind/trunk', + } + }, + { 'version' : '3.7.0', 'md5':'b98b9495e5655a672d6cb83e1a180f8e', 'resources' : { @@ -161,15 +176,25 @@ class Llvm(Package): ] for release in releases: - version(release['version'], release['md5'], url=llvm_url % release) - - for name, md5 in release['resources'].items(): - resource(name=name, - url=resources[name]['url'] % release, - md5=md5, - destination=resources[name]['destination'], - when='@%(version)s' % release, - placement=resources[name].get('placement', None)) + if release['version'] == 'trunk' : + version(release['version'], svn=release['repo']) + + for name, repo in release['resources'].items(): + resource(name=name, + svn=repo, + destination=resources[name]['destination'], + when='@%(version)s' % release, + placement=resources[name].get('placement', None)) + else: + version(release['version'], release['md5'], url=llvm_url % release) + + for name, md5 in release['resources'].items(): + resource(name=name, + url=resources[name]['url'] % release, + md5=md5, + destination=resources[name]['destination'], + when='@%(version)s' % release, + placement=resources[name].get('placement', None)) # SVN - current develop version('develop', svn='http://llvm.org/svn/llvm-project/llvm/trunk') |