diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-14 09:46:58 +0200 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-14 09:46:58 +0200 |
| commit | 420a61491defb87f7cb686d7f7d128c1313ac89d (patch) | |
| tree | ede7c73bb944afa71127c9777e5a8e1230292390 /var | |
| parent | 2bffd569d76bbd35d336c977af3a4d066f3f5644 (diff) | |
| parent | 2cf9ebc62c18414ddafb44bdda2b2487f72a4ec5 (diff) | |
| download | spack-420a61491defb87f7cb686d7f7d128c1313ac89d.tar.gz spack-420a61491defb87f7cb686d7f7d128c1313ac89d.tar.bz2 spack-420a61491defb87f7cb686d7f7d128c1313ac89d.tar.xz spack-420a61491defb87f7cb686d7f7d128c1313ac89d.zip | |
Merge pull request #781 from jgalarowicz/qt3-fixes
Fix compile issues with new libpng versions and qt3 builds by using a…
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/libpng/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index 73c8c62341..9d5782896e 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -8,6 +8,9 @@ class Libpng(Package): version('1.6.16', '1a4ad377919ab15b54f6cb6a3ae2622d') version('1.6.15', '829a256f3de9307731d4f52dc071916d') version('1.6.14', '2101b3de1d5f348925990f9aa8405660') + version('1.5.26', '3ca98347a5541a2dad55cd6d07ee60a9') + version('1.4.19', '89bcbc4fc8b31f4a403906cf4f662330') + version('1.2.56', '9508fc59d10a1ffadd9aae35116c19ee') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 8cb88e6c85..93688fb777 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -29,7 +29,8 @@ class Qt(Package): depends_on("zlib") depends_on("dbus", when='@4:') depends_on("libtiff") - depends_on("libpng") + depends_on("libpng@1.2.56", when='@3') + depends_on("libpng", when='@4:') depends_on("libmng") depends_on("jpeg") @@ -120,6 +121,8 @@ class Qt(Package): @when('@3') def configure(self): + # An user report that this was necessary to link Qt3 on ubuntu + os.environ['LD_LIBRARY_PATH'] = os.getcwd()+'/lib' configure('-prefix', self.prefix, '-v', '-thread', |