summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2015-03-27 17:48:51 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2015-03-27 17:48:51 -0700
commit2b9dd718aed88d7ff5d17e70d761cfae871ad5ce (patch)
tree68d78c06c862f7793f1bba0492763d7b2b2f5942
parentad62b93df92058641104242fd31a72697bbf916f (diff)
parent50687e08cbac835a3eb0cbe1a9bfbc95f9ee2c63 (diff)
downloadspack-2b9dd718aed88d7ff5d17e70d761cfae871ad5ce.tar.gz
spack-2b9dd718aed88d7ff5d17e70d761cfae871ad5ce.tar.bz2
spack-2b9dd718aed88d7ff5d17e70d761cfae871ad5ce.tar.xz
spack-2b9dd718aed88d7ff5d17e70d761cfae871ad5ce.zip
Merge pull request #25 from mplegendre/qtfix
Fix for QT with gcc 4.9 build error
-rw-r--r--var/spack/packages/qt/package.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/packages/qt/package.py b/var/spack/packages/qt/package.py
index 4a9a867511..0e4abe3b1d 100644
--- a/var/spack/packages/qt/package.py
+++ b/var/spack/packages/qt/package.py
@@ -50,9 +50,11 @@ class Qt(Package):
def patch(self):
if self.spec.satisfies('@4'):
- qmake_conf = 'mkspecs/common/g++-base.conf'
+ qmake_conf = 'mkspecs/common/g++-base.conf'
+ qmake_unix_conf = 'mkspecs/common/g++-unix.conf'
elif self.spec.satisfies('@5'):
- qmake_conf = 'qtbase/mkspecs/common/g++-base.conf'
+ qmake_conf = 'qtbase/mkspecs/common/g++-base.conf'
+ qmake_unix_conf = 'qtbase/mkspecs/common/g++-unix.conf'
else:
return
@@ -60,7 +62,7 @@ class Qt(Package):
filter_file(r'^QMAKE_COMPILER *=.*$', 'QMAKE_COMPILER = cc', qmake_conf)
filter_file(r'^QMAKE_CC *=.*$', 'QMAKE_CC = cc', qmake_conf)
filter_file(r'^QMAKE_CXX *=.*$', 'QMAKE_CXX = c++', qmake_conf)
-
+ filter_file(r'^QMAKE_LFLAGS_NOUNDEF *\+?=.*$', 'QMAKE_LFLAGS_NOUNDEF =', qmake_unix_conf)
@property