summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-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: