Flake8 fixes.
This commit is contained in:
parent
786ab114b7
commit
6b6f868f2a
@ -6,7 +6,7 @@
|
|||||||
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
|
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
|
||||||
# LLNL-CODE-647188
|
# LLNL-CODE-647188
|
||||||
#
|
#
|
||||||
# For details, see https://github.com/llnl/spack
|
# For details, see https://github.com/llnl/spack # NOQA: ignore=E501
|
||||||
# Please also see the LICENSE file for our notice and the LGPL.
|
# Please also see the LICENSE file for our notice and the LGPL.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
@ -29,9 +29,9 @@
|
|||||||
|
|
||||||
class Qt(Package):
|
class Qt(Package):
|
||||||
"""Qt is a comprehensive cross-platform C++ application framework."""
|
"""Qt is a comprehensive cross-platform C++ application framework."""
|
||||||
homepage = 'http://qt.io'
|
homepage = 'http://qt.io' # NOQA: ignore=E501
|
||||||
url = 'http://download.qt.io/archive/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.tar.gz'
|
url = 'http://download.qt.io/archive/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.tar.gz' # NOQA: ignore=E501
|
||||||
list_url = 'http://download.qt.io/archive/qt/'
|
list_url = 'http://download.qt.io/archive/qt/' # NOQA: ignore=E501
|
||||||
list_depth = 4
|
list_depth = 4
|
||||||
|
|
||||||
version('5.7.0', '9a46cce61fc64c20c3ac0a0e0fa41b42')
|
version('5.7.0', '9a46cce61fc64c20c3ac0a0e0fa41b42')
|
||||||
@ -53,7 +53,7 @@ class Qt(Package):
|
|||||||
|
|
||||||
patch('qt3krell.patch', when='@3.3.8b+krellpatch')
|
patch('qt3krell.patch', when='@3.3.8b+krellpatch')
|
||||||
|
|
||||||
# https://github.com/xboxdrv/xboxdrv/issues/188
|
# https://github.com/xboxdrv/xboxdrv/issues/188 # NOQA: ignore=E501
|
||||||
patch('btn_trigger_happy.patch', when='@5.7.0:')
|
patch('btn_trigger_happy.patch', when='@5.7.0:')
|
||||||
|
|
||||||
patch('qt4-corewlan-new-osx.patch', when='@4')
|
patch('qt4-corewlan-new-osx.patch', when='@4')
|
||||||
@ -130,7 +130,7 @@ def patch(self):
|
|||||||
'mkspecs/common/g++-base.conf')
|
'mkspecs/common/g++-base.conf')
|
||||||
|
|
||||||
# Necessary to build with GCC 6 and other modern compilers
|
# Necessary to build with GCC 6 and other modern compilers
|
||||||
# http://stackoverflow.com/questions/10354371/
|
# http://stackoverflow.com/questions/10354371/ # NOQA: ignore=E501
|
||||||
filter_file('(^QMAKE_CXXFLAGS .*)', r'\1 -std=gnu++98',
|
filter_file('(^QMAKE_CXXFLAGS .*)', r'\1 -std=gnu++98',
|
||||||
'mkspecs/common/gcc-base.conf')
|
'mkspecs/common/gcc-base.conf')
|
||||||
|
|
||||||
@ -188,7 +188,7 @@ def common_config_args(self):
|
|||||||
|
|
||||||
if '@4' in self.spec and sys.platform == 'darwin':
|
if '@4' in self.spec and sys.platform == 'darwin':
|
||||||
sdkpath = which('xcrun')('--show-sdk-path',
|
sdkpath = which('xcrun')('--show-sdk-path',
|
||||||
# XXX(macos): the 10.11 SDK fails to configure.
|
# XXX(macos): 10.11 SDK fails to configure
|
||||||
'--sdk', 'macosx10.9',
|
'--sdk', 'macosx10.9',
|
||||||
output=str)
|
output=str)
|
||||||
config_args.extend([
|
config_args.extend([
|
||||||
@ -212,7 +212,7 @@ def common_config_args(self):
|
|||||||
# Don't disable all the database drivers, but should
|
# Don't disable all the database drivers, but should
|
||||||
# really get them into spack at some point.
|
# really get them into spack at some point.
|
||||||
|
|
||||||
@when('@3')
|
@when('@3') # NOQA: ignore=F811
|
||||||
def configure(self):
|
def configure(self):
|
||||||
# A user reported that this was necessary to link Qt3 on ubuntu
|
# A user reported that this was necessary to link Qt3 on ubuntu
|
||||||
os.environ['LD_LIBRARY_PATH'] = os.getcwd() + '/lib'
|
os.environ['LD_LIBRARY_PATH'] = os.getcwd() + '/lib'
|
||||||
@ -223,7 +223,7 @@ def configure(self):
|
|||||||
'-release',
|
'-release',
|
||||||
'-fast')
|
'-fast')
|
||||||
|
|
||||||
@when('@4')
|
@when('@4') # NOQA: ignore=F811
|
||||||
def configure(self):
|
def configure(self):
|
||||||
configure('-fast',
|
configure('-fast',
|
||||||
'-no-webkit',
|
'-no-webkit',
|
||||||
@ -231,7 +231,7 @@ def configure(self):
|
|||||||
'-arch', str(self.spec.architecture.target),
|
'-arch', str(self.spec.architecture.target),
|
||||||
*self.common_config_args)
|
*self.common_config_args)
|
||||||
|
|
||||||
@when('@5.0:5.6')
|
@when('@5.0:5.6') # NOQA: ignore=F811
|
||||||
def configure(self):
|
def configure(self):
|
||||||
configure('-no-eglfs',
|
configure('-no-eglfs',
|
||||||
'-no-directfb',
|
'-no-directfb',
|
||||||
@ -239,7 +239,7 @@ def configure(self):
|
|||||||
'-skip', 'qtwebkit',
|
'-skip', 'qtwebkit',
|
||||||
*self.common_config_args)
|
*self.common_config_args)
|
||||||
|
|
||||||
@when('@5.7:')
|
@when('@5.7:') # NOQA: ignore=F811
|
||||||
def configure(self):
|
def configure(self):
|
||||||
args = self.common_config_args
|
args = self.common_config_args
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user