Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
6b6f868f
Commit
6b6f868f
authored
8 years ago
by
Todd Gamblin
Browse files
Options
Downloads
Patches
Plain Diff
Flake8 fixes.
parent
786ab114
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
var/spack/repos/builtin/packages/qt/package.py
+23
-23
23 additions, 23 deletions
var/spack/repos/builtin/packages/qt/package.py
with
23 additions
and
23 deletions
var/spack/repos/builtin/packages/qt/package.py
+
23
−
23
View file @
6b6f868f
...
...
@@ -6,7 +6,7 @@
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
# 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.
#
# This program is free software; you can redistribute it and/or modify
...
...
@@ -29,9 +29,9 @@
class
Qt
(
Package
):
"""
Qt is a comprehensive cross-platform C++ application framework.
"""
homepage
=
'
http://qt.io
'
url
=
'
http://download.qt.io/archive/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.tar.gz
'
list_url
=
'
http://download.qt.io/archive/qt/
'
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
'
# NOQA: ignore=E501
list_url
=
'
http://download.qt.io/archive/qt/
'
# NOQA: ignore=E501
list_depth
=
4
version
(
'
5.7.0
'
,
'
9a46cce61fc64c20c3ac0a0e0fa41b42
'
)
...
...
@@ -53,7 +53,7 @@ class Qt(Package):
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
(
'
qt4-corewlan-new-osx.patch
'
,
when
=
'
@4
'
)
...
...
@@ -130,7 +130,7 @@ def patch(self):
'
mkspecs/common/g++-base.conf
'
)
# 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
'
,
'
mkspecs/common/gcc-base.conf
'
)
...
...
@@ -179,21 +179,21 @@ def common_config_args(self):
if
'
@5:
'
in
self
.
spec
and
sys
.
platform
==
'
darwin
'
:
config_args
.
extend
([
'
-no-xinput2
'
,
'
-no-xcb-xlib
'
,
'
-no-pulseaudio
'
,
'
-no-alsa
'
,
'
-no-gtkstyle
'
,
])
'
-no-xinput2
'
,
'
-no-xcb-xlib
'
,
'
-no-pulseaudio
'
,
'
-no-alsa
'
,
'
-no-gtkstyle
'
,
])
if
'
@4
'
in
self
.
spec
and
sys
.
platform
==
'
darwin
'
:
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
'
,
output
=
str
)
config_args
.
extend
([
'
-sdk
'
,
sdkpath
.
strip
(),
])
'
-sdk
'
,
sdkpath
.
strip
(),
])
use_clang_platform
=
False
if
self
.
spec
.
compiler
.
name
==
'
clang
'
and
\
str
(
self
.
spec
.
compiler
.
version
).
endwith
(
'
-apple
'
):
...
...
@@ -204,15 +204,15 @@ def common_config_args(self):
use_clang_platform
=
True
if
use_clang_platform
:
config_args
.
extend
([
'
-platform
'
,
'
unsupported/macx-clang
'
,
])
'
-platform
'
,
'
unsupported/macx-clang
'
,
])
return
config_args
# Don't disable all the database drivers, but should
# really get them into spack at some point.
@when
(
'
@3
'
)
@when
(
'
@3
'
)
# NOQA: ignore=F811
def
configure
(
self
):
# A user reported that this was necessary to link Qt3 on ubuntu
os
.
environ
[
'
LD_LIBRARY_PATH
'
]
=
os
.
getcwd
()
+
'
/lib
'
...
...
@@ -223,7 +223,7 @@ def configure(self):
'
-release
'
,
'
-fast
'
)
@when
(
'
@4
'
)
@when
(
'
@4
'
)
# NOQA: ignore=F811
def
configure
(
self
):
configure
(
'
-fast
'
,
'
-no-webkit
'
,
...
...
@@ -231,7 +231,7 @@ def configure(self):
'
-arch
'
,
str
(
self
.
spec
.
architecture
.
target
),
*
self
.
common_config_args
)
@when
(
'
@5.0:5.6
'
)
@when
(
'
@5.0:5.6
'
)
# NOQA: ignore=F811
def
configure
(
self
):
configure
(
'
-no-eglfs
'
,
'
-no-directfb
'
,
...
...
@@ -239,14 +239,14 @@ def configure(self):
'
-skip
'
,
'
qtwebkit
'
,
*
self
.
common_config_args
)
@when
(
'
@5.7:
'
)
@when
(
'
@5.7:
'
)
# NOQA: ignore=F811
def
configure
(
self
):
args
=
self
.
common_config_args
if
not
sys
.
platform
==
'
darwin
'
:
args
.
extend
([
'
-qt-xcb
'
,
])
'
-qt-xcb
'
,
])
configure
(
'
-no-eglfs
'
,
'
-no-directfb
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment