hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

QT package: only enable fontconfig when freetype is enabled (#12574)

Browse source 
The 'fontconfig' option is only valid when freetype is enabled.
This commit is contained in:
Seth R. Johnson 2019-09-23 13:04:29 -04:00 committed by Peter Scheibel
parent b4e148b562
commit 27d4e9a1d1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
var/spack/repos/builtin/packages/qt/package.py
View file

@ -149,7 +149,7 @@ class Qt(Package):
# Non-macOS dependencies and special macOS constraints # Non-macOS dependencies and special macOS constraints
if MACOS_VERSION is None: if MACOS_VERSION is None:
depends_on("fontconfig") depends_on("fontconfig", when='freetype=spack')
depends_on("libx11") depends_on("libx11")
depends_on("libxcb") depends_on("libxcb")
depends_on("libxkbcommon") depends_on("libxkbcommon")
@ -318,6 +318,9 @@ def common_config_args(self):
'-system-freetype', '-system-freetype',
'-I{0}/freetype2'.format(self.spec['freetype'].prefix.include) '-I{0}/freetype2'.format(self.spec['freetype'].prefix.include)
]) ])
if not MACOS_VERSION:
config_args.append('-fontconfig')
elif self.spec.variants['freetype'].value == 'qt': elif self.spec.variants['freetype'].value == 'qt':
config_args.append('-qt-freetype') config_args.append('-qt-freetype')
else: else:
@ -347,9 +350,6 @@ def common_config_args(self):
if self.spec.satisfies('@5.7:'): if self.spec.satisfies('@5.7:'):
config_args.append('-system-doubleconversion') config_args.append('-system-doubleconversion')
if not MACOS_VERSION:
config_args.append('-fontconfig')
if '@:5.7.1' in self.spec: if '@:5.7.1' in self.spec:
config_args.append('-no-openvg') config_args.append('-no-openvg')
else: else: