diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2022-05-06 09:36:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-06 09:36:56 -0400 |
| commit | d8e010a9f5dff9d9555bfc38e158153f1e7c5989 (patch) | |
| tree | 383822eae5588409531e1c1d94b77d416dac46bc | |
| parent | 5a55e78073672632aeaf6efe3982ea31a19ddff9 (diff) | |
| download | spack-d8e010a9f5dff9d9555bfc38e158153f1e7c5989.tar.gz spack-d8e010a9f5dff9d9555bfc38e158153f1e7c5989.tar.bz2 spack-d8e010a9f5dff9d9555bfc38e158153f1e7c5989.tar.xz spack-d8e010a9f5dff9d9555bfc38e158153f1e7c5989.zip | |
ci: Enable the ParaView GUI in the DAVSDK pipeline (#30473)
* ci: Enable the ParaView GUI in the DAVSDK pipeline
* qt: Patch for long paths in ci
3 files changed, 30 insertions, 5 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml index 9834d28b0d..f6939853ed 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml @@ -10,13 +10,14 @@ spack: all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}' packages: - conduit: - version: - - "0.7.2" + cmake: + variants: ~ownlibs + curl: + variants: tls=mbedtls mesa: - variants: ~glx +osmesa + variants: +glx ~osmesa +opengl ~opengles +llvm paraview: - variants: +osmesa + variants: +qt all: target: [x86_64] @@ -53,6 +54,7 @@ spack: mappings: - match: - llvm + - qt runner-attributes: tags: [ "spack", "public", "huge", "x86_64" ] variables: diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index a4b09ae4de..98eba38962 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -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') diff --git a/var/spack/repos/builtin/packages/qt/qt59-qtbase-qtconfig256.patch b/var/spack/repos/builtin/packages/qt/qt59-qtbase-qtconfig256.patch new file mode 100644 index 0000000000..1341a56838 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt59-qtbase-qtconfig256.patch @@ -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[] = {" \ |