summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2015-02-18 11:08:25 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2015-02-18 13:16:22 -0800
commitdb113733513345059b0a6d36aae8cddc56e6560a (patch)
treeecb71cf0f08f6b90b4efcd6a9682415cdc90bd41
parent59198e29f9760ec0f3c9e612704022d34e55ebf4 (diff)
downloadspack-db113733513345059b0a6d36aae8cddc56e6560a.tar.gz
spack-db113733513345059b0a6d36aae8cddc56e6560a.tar.bz2
spack-db113733513345059b0a6d36aae8cddc56e6560a.tar.xz
spack-db113733513345059b0a6d36aae8cddc56e6560a.zip
Resurrect combined qt4/5 package from b7dacb
-rw-r--r--var/spack/packages/qt/package.py77
1 files changed, 41 insertions, 36 deletions
diff --git a/var/spack/packages/qt/package.py b/var/spack/packages/qt/package.py
index 1535bd5948..1dc3e1e51d 100644
--- a/var/spack/packages/qt/package.py
+++ b/var/spack/packages/qt/package.py
@@ -62,42 +62,47 @@ class Qt(Package):
filter_file(r'^QMAKE_CXX *=.*$', 'QMAKE_CXX = c++', qmake_conf)
+
+ @property
+ def common_config_args(self):
+ return [
+ '-prefix', self.prefix,
+ '-v',
+ '-opensource',
+ '-opengl',
+ "-release",
+ '-shared',
+ '-confirm-license',
+ '-openssl-linked',
+ '-dbus-linked',
+ '-optimized-qmake',
+ '-no-openvg',
+ '-no-pch',
+ # NIS is deprecated in more recent glibc
+ "-no-nis",
+ # For now, disable all the database drivers
+ "-no-sql-db2", "-no-sql-ibase", "-no-sql-mysql", "-no-sql-oci", "-no-sql-odbc",
+ "-no-sql-psql", "-no-sql-sqlite", "-no-sql-sqlite2", "-no-sql-tds"]
+
+
+ @when('@4')
+ def configure(self):
+ configure('-fast',
+ '-no-webkit',
+ *self.common_config_args)
+
+
+ @when('@5')
+ def configure(self):
+ configure('-no-eglfs',
+ '-no-directfb',
+ '-qt-xcb',
+ # If someone wants to get a webkit build working, be my guest!
+ '-skip', 'qtwebkit',
+ *self.common_config_args)
+
+
def install(self, spec, prefix):
- if self.spec.satisfies('@4'):
- configure('-v',
- '-confirm-license',
- '-opensource',
- '-prefix', prefix,
- '-openssl-linked',
- '-dbus-linked',
- #'-fast',
- '-opengl',
- '-optimized-qmake',
- '-no-pch',
- # phonon required for py-pyqt
- # '-no-phonon',
- # '-no-phonon-backend',
- '-no-openvg')
- elif self.spec.satisfies('@5'):
- # Apparently this is the only way to
- # "truly" get rid of webkit compiles now...
- os.rename("qtwebkit","no-qtwebkit")
- os.rename("qtwebkit-examples","no-qtwebkit-examples")
-
- configure('-v',
- '-confirm-license',
- '-opensource',
- '-prefix', prefix,
- '-openssl-linked',
- '-dbus-linked',
- #'-fast',
- '-opengl',
- '-qt-xcb',
- '-optimized-qmake',
- '-no-pch',
- # phonon required for py-pyqt
- # '-no-phonon',
- # '-no-phonon-backend',
- '-no-openvg')
+ self.configure()
make()
make("install")