summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMichael Kuhn <michael.kuhn@informatik.uni-hamburg.de>2019-10-10 05:22:52 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2019-10-09 22:22:52 -0500
commit2e2b1a5e02033b85db7f427cc947399e7259c7ca (patch)
tree6b314005e7baf1a63b2f787d2254dca112571e6e /var
parent5b879459c7b20ca5d5f18136bb025a4001fdeb7b (diff)
downloadspack-2e2b1a5e02033b85db7f427cc947399e7259c7ca.tar.gz
spack-2e2b1a5e02033b85db7f427cc947399e7259c7ca.tar.bz2
spack-2e2b1a5e02033b85db7f427cc947399e7259c7ca.tar.xz
spack-2e2b1a5e02033b85db7f427cc947399e7259c7ca.zip
qt: Add 5.13.1 and missing zlib flags (#13109)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 2df6befa71..bf76caa008 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -21,6 +21,7 @@ class Qt(Package):
phases = ['configure', 'build', 'install']
+ version('5.13.1', 'adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e')
version('5.12.5', 'a2299e21db7767caf98242767bffb18a2a88a42fee2d6a393bedd234f8c91298')
version('5.12.2', '59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5')
version('5.11.3', '859417642713cee2493ee3646a7fee782c9f1db39e41d7bb1322bba0c5f0ff4d')
@@ -376,6 +377,7 @@ class Qt(Package):
# FIXME: those could work for other versions
png = self.spec['libpng']
jpeg = self.spec['jpeg']
+ zlib = self.spec['zlib']
config_args.extend([
'-system-libpng',
'{0}'.format(png.libs.search_flags),
@@ -383,7 +385,9 @@ class Qt(Package):
'-system-libjpeg',
'{0}'.format(jpeg.libs.search_flags),
'{0}'.format(jpeg.headers.include_flags),
- '-system-zlib'
+ '-system-zlib',
+ '{0}'.format(zlib.libs.search_flags),
+ '{0}'.format(zlib.headers.include_flags)
])
if '@:5.7.0' in self.spec: