diff options
| author | Gregory L. Lee <lee218@llnl.gov> | 2015-02-17 16:26:00 -0800 |
|---|---|---|
| committer | Gregory L. Lee <lee218@llnl.gov> | 2015-02-17 16:26:00 -0800 |
| commit | 44003449d594e9ba8ea1adaed84c7c938b439972 (patch) | |
| tree | 69040e9003a4a099b47def81621cafb58be85016 | |
| parent | 17ac609d2399af891c4aa85c09585ed8eadf06ff (diff) | |
| download | spack-44003449d594e9ba8ea1adaed84c7c938b439972.tar.gz spack-44003449d594e9ba8ea1adaed84c7c938b439972.tar.bz2 spack-44003449d594e9ba8ea1adaed84c7c938b439972.tar.xz spack-44003449d594e9ba8ea1adaed84c7c938b439972.zip | |
fixed install steps for version 4
| -rw-r--r-- | var/spack/packages/qt/package.py | 55 |
1 files changed, 36 insertions, 19 deletions
diff --git a/var/spack/packages/qt/package.py b/var/spack/packages/qt/package.py index 30f46c08dc..1535bd5948 100644 --- a/var/spack/packages/qt/package.py +++ b/var/spack/packages/qt/package.py @@ -63,24 +63,41 @@ class Qt(Package): def install(self, spec, prefix): - # 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') + 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') make() make("install") |