Skip to content

only check for qtwebengine if glibc is sufficiently recent #1771

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

Merged
ocaisa merged 1 commit into from
Jul 16, 2019
Merged

only check for qtwebengine if glibc is sufficiently recent #1771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions easybuild/easyblocks/q/qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.filetools import apply_regex_substitutions
from easybuild.tools.run import run_cmd_qa
from easybuild.tools.systemtools import get_shared_lib_ext
from easybuild.tools.systemtools import get_glibc_version, get_shared_lib_ext


class EB_Qt(ConfigureMake):
Expand Down Expand Up @@ -168,8 +168,12 @@ def sanity_check_step(self):
}

if self.cfg['check_qtwebengine']:
qtwebengine_libs = ['libQt%s%s.%s' % (libversion, l, shlib_ext) for l in ['WebEngine', 'WebEngineCore']]
custom_paths['files'].extend([os.path.join('lib', lib) for lib in qtwebengine_libs])
glibc_version = get_glibc_version()
if LooseVersion(glibc_version) > LooseVersion("2.16"):
qtwebengine_libs = ['libQt%s%s.%s' % (libversion, l, shlib_ext) for l in ['WebEngine', 'WebEngineCore']]
custom_paths['files'].extend([os.path.join('lib', lib) for lib in qtwebengine_libs])
else:
self.log.debug("Skipping check for qtwebengine, since it requires a more recent glibc.")

if LooseVersion(self.version) >= LooseVersion('4'):
custom_paths['files'].append('bin/xmlpatterns')
Expand Down