From 44003449d594e9ba8ea1adaed84c7c938b439972 Mon Sep 17 00:00:00 2001
From: "Gregory L. Lee" <lee218@llnl.gov>
Date: Tue, 17 Feb 2015 16:26:00 -0800
Subject: [PATCH] fixed install steps for version 4
---
var/spack/packages/qt/package.py | 55 +++++++++++++++++++++-----------
1 file 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 @@ def patch(self):
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")
--
GitLab