summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth R. Johnson <johnsonsr@ornl.gov>2019-09-23 13:04:29 -0400
committerPeter Scheibel <scheibel1@llnl.gov>2019-09-23 10:04:29 -0700
commit27d4e9a1d1e869bf6567deef56bda4fb70e46e5e (patch)
tree3e9ba3b9193c828f1451554abbd88a4b5d5fa8e3
parentb4e148b5623e8b6506a390a42c70c538a7d840d5 (diff)
downloadspack-27d4e9a1d1e869bf6567deef56bda4fb70e46e5e.tar.gz
spack-27d4e9a1d1e869bf6567deef56bda4fb70e46e5e.tar.bz2
spack-27d4e9a1d1e869bf6567deef56bda4fb70e46e5e.tar.xz
spack-27d4e9a1d1e869bf6567deef56bda4fb70e46e5e.zip
QT package: only enable fontconfig when freetype is enabled (#12574)
The 'fontconfig' option is only valid when freetype is enabled.
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 8b192de89f..c67b6a76af 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -149,7 +149,7 @@ class Qt(Package):
# Non-macOS dependencies and special macOS constraints
if MACOS_VERSION is None:
- depends_on("fontconfig")
+ depends_on("fontconfig", when='freetype=spack')
depends_on("libx11")
depends_on("libxcb")
depends_on("libxkbcommon")
@@ -318,6 +318,9 @@ class Qt(Package):
'-system-freetype',
'-I{0}/freetype2'.format(self.spec['freetype'].prefix.include)
])
+ if not MACOS_VERSION:
+ config_args.append('-fontconfig')
+
elif self.spec.variants['freetype'].value == 'qt':
config_args.append('-qt-freetype')
else:
@@ -347,9 +350,6 @@ class Qt(Package):
if self.spec.satisfies('@5.7:'):
config_args.append('-system-doubleconversion')
- if not MACOS_VERSION:
- config_args.append('-fontconfig')
-
if '@:5.7.1' in self.spec:
config_args.append('-no-openvg')
else: