summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py43
-rw-r--r--var/spack/repos/builtin/packages/openssl/package.py39
2 files changed, 73 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')
diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py
index a225e30f6c..c73102f05d 100644
--- a/var/spack/repos/builtin/packages/openssl/package.py
+++ b/var/spack/repos/builtin/packages/openssl/package.py
@@ -1,3 +1,6 @@
+import urllib
+import llnl.util.tty as tty
+
from spack import *
class Openssl(Package):
@@ -18,6 +21,42 @@ class Openssl(Package):
depends_on("zlib")
parallel = False
+ def url_for_version(self, version):
+ # This URL is computed pinging the place where the latest version is stored. To avoid slowdown
+ # due to repeated pinging, we store the URL in a private class attribute to do the job only once per version
+ openssl_urls = getattr(Openssl, '_openssl_url', {})
+ openssl_url = openssl_urls.get(version, None)
+ # Same idea, but just to avoid issuing the same message multiple times
+ warnings_given_to_user = getattr(Openssl, '_warnings_given', {})
+ if openssl_url is None:
+ latest = 'http://www.openssl.org/source/openssl-{version}.tar.gz'
+ older = 'http://www.openssl.org/source/old/{version_number}/openssl-{version_full}.tar.gz'
+ # Try to use the url where the latest tarballs are stored. If the url does not exist (404), then
+ # return the url for older format
+ version_number = '.'.join([str(x) for x in version[:-1]])
+ older_url = older.format(version_number=version_number, version_full=version)
+ latest_url = latest.format(version=version)
+ response = urllib.urlopen(latest.format(version=version))
+ if response.getcode() == 404:
+ openssl_url = older_url
+ # Checks if we already warned the user for this particular version of OpenSSL.
+ # If not we display a warning message and mark this version
+ if not warnings_given_to_user.get(version, False):
+ tty.warn('This installation depends on an old version of OpenSSL, which may have known security issues. ')
+ tty.warn('Consider updating to the latest version of this package.')
+ tty.warn('More details at {homepage}'.format(homepage=Openssl.homepage))
+ warnings_given_to_user[version] = True
+ else:
+ openssl_url = latest_url
+ # Store the computed URL
+ openssl_urls[version] = openssl_url
+ # Store the updated dictionary of URLS
+ Openssl._openssl_url = openssl_urls
+ # Store the updated dictionary of warnings
+ Openssl._warnings_given = warnings_given_to_user
+
+ return openssl_url
+
def install(self, spec, prefix):
# OpenSSL uses a variable APPS in its Makefile. If it happens to be set
# in the environment, then this will override what is set in the