hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CONFIG: update qt package to build qt-5.7.1 (#3535)

Browse source 
- adjusted formatting to reduce some flake8 complaints
This commit is contained in:
Mark Olesen 2017-03-27 15:29:33 +02:00 committed by Adam J. Stewart
parent a623a146de
commit f3ee4ec5bd
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
var/spack/repos/builtin/packages/qt/package.py
View file

@ -35,6 +35,7 @@ class Qt(Package):
list_url = 'http://download.qt.io/archive/qt/' list_url = 'http://download.qt.io/archive/qt/'
list_depth = 4 list_depth = 4
version('5.7.1', '031fb3fd0c3cc0f1082644492683f18d')
version('5.7.0', '9a46cce61fc64c20c3ac0a0e0fa41b42') version('5.7.0', '9a46cce61fc64c20c3ac0a0e0fa41b42')
version('5.5.1', '59f0216819152b77536cf660b015d784') version('5.5.1', '59f0216819152b77536cf660b015d784')
version('5.4.2', 'fa1c4d819b401b267eb246a543a63ea5') version('5.4.2', 'fa1c4d819b401b267eb246a543a63ea5')
@ -46,13 +47,20 @@ class Qt(Package):
# Add patch for compile issues with qt3 found with use in the # Add patch for compile issues with qt3 found with use in the
# OpenSpeedShop project # OpenSpeedShop project
variant('krellpatch', default=False, description="Build with openspeedshop based patch.") variant('krellpatch', default=False,
variant('mesa', default=False, description="Depend on mesa.") description="Build with openspeedshop based patch.")
variant('gtk', default=False, description="Build with gtkplus.") variant('mesa', default=False,
variant('webkit', default=False, description="Build the Webkit extension") description="Depend on mesa.")
variant('examples', default=False, description="Build examples.") variant('gtk', default=False,
variant('dbus', default=False, description="Build with D-Bus support.") description="Build with gtkplus.")
variant('phonon', default=False, description="Build with phonon support.") 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') patch('qt3krell.patch', when='@3.3.8b+krellpatch')
@ -77,6 +85,9 @@ class Qt(Package):
depends_on("jpeg") depends_on("jpeg")
depends_on("icu4c") depends_on("icu4c")
# QtQml
depends_on("python", when='@5.7.0:', type='build')
# OpenGL hardware acceleration # OpenGL hardware acceleration
depends_on("mesa", when='@4:+mesa') depends_on("mesa", when='@4:+mesa')
depends_on("libxcb", when=sys.platform != 'darwin') depends_on("libxcb", when=sys.platform != 'darwin')
@ -176,10 +187,15 @@ def common_config_args(self):
'-optimized-qmake', '-optimized-qmake',
'-no-openvg', '-no-openvg',
'-no-pch', '-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: if '~examples' in self.spec:
config_args.extend(['-nomake', 'examples']) config_args.extend(['-nomake', 'examples'])