From f3ee4ec5bde6b16aed5aaf73ee340e34f47f789c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 27 Mar 2017 15:29:33 +0200 Subject: [PATCH] CONFIG: update qt package to build qt-5.7.1 (#3535) - adjusted formatting to reduce some flake8 complaints --- .../repos/builtin/packages/qt/package.py | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 6d77f28846..60c5f15ece 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -35,6 +35,7 @@ class Qt(Package): list_url = 'http://download.qt.io/archive/qt/' list_depth = 4 + version('5.7.1', '031fb3fd0c3cc0f1082644492683f18d') version('5.7.0', '9a46cce61fc64c20c3ac0a0e0fa41b42') version('5.5.1', '59f0216819152b77536cf660b015d784') version('5.4.2', 'fa1c4d819b401b267eb246a543a63ea5') @@ -46,13 +47,20 @@ class Qt(Package): # Add patch for compile issues with qt3 found with use in the # OpenSpeedShop project - variant('krellpatch', default=False, description="Build with openspeedshop based patch.") - variant('mesa', default=False, description="Depend on mesa.") - variant('gtk', default=False, description="Build with gtkplus.") - variant('webkit', default=False, description="Build the Webkit extension") - variant('examples', default=False, description="Build examples.") - variant('dbus', default=False, description="Build with D-Bus support.") - variant('phonon', default=False, description="Build with phonon support.") + variant('krellpatch', default=False, + description="Build with openspeedshop based patch.") + variant('mesa', default=False, + description="Depend on mesa.") + variant('gtk', default=False, + description="Build with gtkplus.") + variant('webkit', default=False, + description="Build the Webkit extension") + variant('examples', default=False, + description="Build examples.") + variant('dbus', default=False, + description="Build with D-Bus support.") + variant('phonon', default=False, + description="Build with phonon support.") patch('qt3krell.patch', when='@3.3.8b+krellpatch') @@ -77,6 +85,9 @@ class Qt(Package): depends_on("jpeg") depends_on("icu4c") + # QtQml + depends_on("python", when='@5.7.0:', type='build') + # OpenGL hardware acceleration depends_on("mesa", when='@4:+mesa') depends_on("libxcb", when=sys.platform != 'darwin') @@ -176,10 +187,15 @@ def common_config_args(self): '-optimized-qmake', '-no-openvg', '-no-pch', - # NIS is deprecated in more recent glibc - '-no-nis' ] + if '@:5.7.0' in self.spec: + config_args.extend([ + # NIS is deprecated in more recent glibc, + # but qt-5.7.1 does not recognize this option + '-no-nis', + ]) + if '~examples' in self.spec: config_args.extend(['-nomake', 'examples'])