Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase

Conflicts:
	lib/spack/spack/build_environment.py
	lib/spack/spack/package.py
	var/spack/repos/builtin/packages/astyle/package.py
	var/spack/repos/builtin/packages/lzo/package.py
	var/spack/repos/builtin/packages/openjpeg/package.py
	var/spack/repos/builtin/packages/swiftsim/package.py
This commit is contained in:
alalazo
2016-09-04 10:12:52 +02:00
233 changed files with 14351 additions and 2338 deletions

View File

@@ -29,7 +29,7 @@ class Lzo(AutotoolsPackage):
"""Real-time data compression library"""
homepage = 'https://www.oberhumer.com/opensource/lzo/'
url = 'https://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz'
url = 'http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz'
version('2.09', 'c7ffc9a103afe2d1bba0b015e7aa887f')
version('2.08', 'fcec64c26a0f4f4901468f360029678f')