From 08b5264607ce700d5f7352fb29923084f343c549 Mon Sep 17 00:00:00 2001
From: "Seth R. Johnson" <johnsonsr@ornl.gov>
Date: Fri, 21 Feb 2020 13:11:12 -0500
Subject: [PATCH] Disable qt3d when opengl is disabled (#15149)
* Disable qt3d when opengl is disabled
* Remove `-skip qtquick3d` unless QT 5.14
Found while checking build of qt 5.14.
---
var/spack/repos/builtin/packages/qt/package.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 4e6af88bb7..c07aa5c86e 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -359,9 +359,6 @@ def common_config_args(self):
'-{0}opengl'.format('' if '+opengl' in self.spec else 'no-'),
'-release',
'-confirm-license',
- '-openssl-linked',
- openssl.libs.search_flags,
- openssl.headers.include_flags,
'-optimized-qmake',
'-no-pch',
]
@@ -380,7 +377,11 @@ def common_config_args(self):
config_args.append('-no-freetype')
if '+ssl' in self.spec:
- config_args.append('-openssl-linked')
+ config_args.extend([
+ '-openssl-linked',
+ openssl.libs.search_flags,
+ openssl.headers.include_flags,
+ ])
else:
config_args.append('-no-openssl')
@@ -568,6 +569,12 @@ def configure(self, spec, prefix):
if version >= Version('5.10') and '~opengl' in spec:
config_args.extend([
'-skip', 'webglplugin',
+ '-skip', 'qt3d',
+ ])
+
+ if version >= Version('5.14') and '~opengl' in spec:
+ config_args.extend([
+ '-skip', 'qtquick3d',
])
configure(*config_args)
--
GitLab