Skip to content

Commit

Permalink
Merge pull request #1734 from boegel/Qt486_intel2015a_fix
Browse files Browse the repository at this point in the history
add patch for Qt 4.8.6 with intel/2015a
  • Loading branch information
boegel committed Jun 23, 2015
2 parents 9697a87 + 9f19737 commit 3b4f369
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
5 changes: 4 additions & 1 deletion easybuild/easyconfigs/q/Qt/Qt-4.8.6-intel-2015a.eb
Expand Up @@ -12,7 +12,10 @@ source_urls = [
]
sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']

patches = ['Qt-4.8.6_icc-qUnused.patch']
patches = [
'Qt-%(version)s_icc-qUnused.patch',
'Qt-%(version)s_phonon-export.patch',
]

dependencies = [('GLib', '2.40.0')]

Expand Down
15 changes: 15 additions & 0 deletions easybuild/easyconfigs/q/Qt/Qt-4.8.6_phonon-export.patch
@@ -0,0 +1,15 @@
fixed for error "undefined reference to `vtable for Phonon::ObjectDescriptionModel<(Phonon::ObjectDescriptionType)0>'"
that occurs (only) on some systems (e.g. RHEL6/Sandy Bridge)
based on https://forum.qt.io/topic/35044/build-failure-4-8-5-on-mac-with-phonon/9
author: Kenneth Hoste (HPC-UGent)
--- qt-everywhere-opensource-src-4.8.6/src/3rdparty/phonon/phonon/objectdescriptionmodel.h.orig 2015-06-22 23:18:54.723573581 +0300
+++ qt-everywhere-opensource-src-4.8.6/src/3rdparty/phonon/phonon/objectdescriptionmodel.h 2015-06-22 23:19:16.902399019 +0300
@@ -141,7 +141,7 @@

/* Required to ensure template class vtables are exported on both symbian
and existing builds. */
-#if (defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT)) || defined(Q_CC_CLANG)
+#if (defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT)) || defined(Q_CC_CLANG) || defined(Q_CC_INTEL)
// RVCT compiler (2.2.686) requires the export declaration to be on the class to export vtables
// MWC compiler works both ways
// GCCE compiler is unknown (it can't compile QtCore yet)

0 comments on commit 3b4f369

Please sign in to comment.