zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Enable the ParaView GUI in the DAVSDK pipeline (#30473)

Browse Source 
* ci: Enable the ParaView GUI in the DAVSDK pipeline

* qt: Patch for long paths in ci
This commit is contained in:
Chuck Atkins
2022-05-06 09:36:56 -04:00
committed by GitHub
parent 5a55e78073
commit d8e010a9f5
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/qt/package.py
View File

@@ -153,6 +153,11 @@ class Qt(Package):
working_dir='qtbase',
when='@5.14: %apple-clang@13:')
# Spack path substitution uses excessively long paths that exceed the hard-coded
# limit of 256 used by teh generated code with the prefix path as string literals
# causing qt to fail in ci. This increases that limit to 1024.
patch('qt59-qtbase-qtconfig256.patch', working_dir='qtbase', when='@5.9:5')
conflicts('%gcc@10:', when='@5.9:5.12.6 +opengl')
conflicts('%gcc@11:', when='@5.8')
conflicts('%apple-clang@13:', when='@:5.13')

18
var/spack/repos/builtin/packages/qt/qt59-qtbase-qtconfig256.patch Normal file
View File

@@ -0,0 +1,18 @@
diff --git a/configure.pri b/configure.pri
index be1b166080..13fdf0b91e 100644
--- a/configure.pri
+++ b/configure.pri
@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) {
"static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \
"" \
"/* Installation Info */" \
- "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \
+ "static const char qt_configure_prefix_path_str [12+1024] = \"qt_prfxpath=$$config.input.prefix\";" \
"$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
- "static const char qt_configure_ext_prefix_path_str [12+256] = \"qt_epfxpath=$$config.input.extprefix\";" \
- "static const char qt_configure_host_prefix_path_str [12+256] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
+ "static const char qt_configure_ext_prefix_path_str [12+1024] = \"qt_epfxpath=$$config.input.extprefix\";" \
+ "static const char qt_configure_host_prefix_path_str [12+1024] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
"$${LITERAL_HASH}endif" \
"" \
"static const short qt_configure_str_offsets[] = {" \