From 50687e08cbac835a3eb0cbe1a9bfbc95f9ee2c63 Mon Sep 17 00:00:00 2001
From: Matthew LeGendre <legendre1@llnl.gov>
Date: Fri, 27 Mar 2015 16:56:15 -0700
Subject: [PATCH] Fix QT with gcc 4.9 build error where QT's -Wl,--no-undefined
interfered with gcc's implicit libgcc_s.so library
---
var/spack/packages/qt/package.py | 8 +++++---
1 file 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 @@ def setup_dependent_environment(self, module, spec, dep_spec):
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 @@ def patch(self):
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
--
GitLab