Skip to content

fix building of QtWebEngine in Qt5-5.10.1-intel-2018a.eb (WIP) #7010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
boegel wants to merge 2 commits into from
Closed

fix building of QtWebEngine in Qt5-5.10.1-intel-2018a.eb (WIP) #7010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d2c016
fix building of QtWebEngine in Qt5-5.10.1-intel-2018a.eb
boegel Oct 12, 2018
92a126b
add missing gperf dependency for Qt5 5.10.1 with intel/2018a
boegel Oct 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions easybuild/easyconfigs/q/Qt5/Qt5-5.10.1-intel-2018a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,28 @@ source_urls = [
'http://download.qt.io/archive/qt/%(version_major_minor)s/%(version)s/single/'
]
sources = ['qt-everywhere-src-%(version)s.tar.xz']
checksums = ['05ffba7b811b854ed558abf2be2ddbd3bb6ddd0b60ea4b5da75d277ac15e740a']
patches = ['Qt5-%(version)s_fix-QtWebEngine-intel.patch']
checksums = [
'05ffba7b811b854ed558abf2be2ddbd3bb6ddd0b60ea4b5da75d277ac15e740a', # qt-everywhere-src-5.10.1.tar.xz
'ce412b74528608721ac8fec9a2fa380fd4e92dc8b8186fea3aab32e2431db6cf', # Qt5-5.10.1_fix-QtWebEngine-intel.patch
]

builddependencies = [('pkg-config', '0.29.2')]

# qtgamepad needs recent kernel/libevdev (fails on RHEL 6.x)
configopts = '-skip qtgamepad'

dependencies = [
('GLib', '2.54.3'),
('libpng', '1.6.34'),
('X11', '20180131'),
('libGLU', '9.0.0'),
('NSS', '3.39'),
('DBus', '1.13.6'),
('gperf', '3.1'),
]

# qtgamepad needs recent kernel/libevdev (fails on RHEL 6.x)
configopts = '-skip qtgamepad'

# make sure QtWebEngine component is being built & installed
check_qtwebengine = True

moduleclass = 'devel'
30 changes: 30 additions & 0 deletions easybuild/easyconfigs/q/Qt5/Qt5-5.10.1_fix-QtWebEngine-intel.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
don't disable building of QtWebEngine when Intel compilers are used

author: Kenneth Hoste (HPC-UGent)

--- qt-everywhere-src-5.10.1/qtwebengine/mkspecs/features/platform.prf.orig 2018-10-12 13:34:32.026246699 +0200
+++ qt-everywhere-src-5.10.1/qtwebengine/mkspecs/features/platform.prf 2018-10-12 13:34:11.676384153 +0200
@@ -14,9 +14,9 @@
linux {
if(!gcc:!clang)|intel_icc {
- skipBuild("Qt WebEngine on Linux requires clang or GCC.")
+ #skipBuild("Qt WebEngine on Linux requires clang or GCC.")
- return(false)
+ #return(false)
}
- gcc:!clang:!isGCCVersionSupported(): return(false)
+ #gcc:!clang:!isGCCVersionSupported(): return(false)
} else:win32 {
winrt {
skipBuild("WinRT is not supported.")
--- qt-everywhere-src-5.10.1/qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/HeapAllocator.h.orig 2018-10-12 13:33:05.176796309 +0200
+++ qt-everywhere-src-5.10.1/qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/HeapAllocator.h 2018-10-12 13:33:44.096551263 +0200
@@ -130,7 +130,7 @@
size, IsEagerlyFinalizedType<Metadata>::value));
}

-#if defined(OS_WIN) && defined(COMPILER_MSVC)
+#if (defined(OS_WIN) && defined(COMPILER_MSVC)) || defined(__INTEL_COMPILER)
// MSVC eagerly instantiates the unused 'operator delete',
// provide a version that asserts and fails at run-time if
// used.