zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for #14148 (#14595)

Browse Source 
* Dirty hack to fix #14148

* A better way of checking if a package is taken from system

* Update var/spack/repos/builtin/packages/qt/package.py

Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>

* Update qt/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
iarspider 2020-01-28 21:15:29 +01:00 committed by Adam J. Stewart
parent 12b0340d2f
commit 67c6d99219
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
var/spack/repos/builtin/packages/qt/package.py
View File

@ -323,8 +323,8 @@ def common_config_args(self):
'-release', '-release',
'-confirm-license', '-confirm-license',
'-openssl-linked', '-openssl-linked',
'{0}'.format(openssl.libs.search_flags), openssl.libs.search_flags,
'{0}'.format(openssl.headers.include_flags), openssl.headers.include_flags,
'-optimized-qmake', '-optimized-qmake',
'-no-pch', '-no-pch',
] ]
@ -351,7 +351,7 @@ def common_config_args(self):
sqlite = self.spec['sqlite'] sqlite = self.spec['sqlite']
config_args.extend([ config_args.extend([
'-system-sqlite', '-system-sqlite',
'-R', '{0}'.format(sqlite.prefix.lib), '-R', sqlite.prefix.lib,
]) ])
else: else:
comps = ['db2', 'ibase', 'oci', 'tds', 'mysql', 'odbc', 'psql', comps = ['db2', 'ibase', 'oci', 'tds', 'mysql', 'odbc', 'psql',
@ -369,19 +369,19 @@ def common_config_args(self):
harfbuzz = self.spec['harfbuzz'] harfbuzz = self.spec['harfbuzz']
config_args.extend([ config_args.extend([
'-system-harfbuzz', '-system-harfbuzz',
'{0}'.format(harfbuzz.libs.search_flags), harfbuzz.libs.search_flags,
'{0}'.format(harfbuzz.headers.include_flags), harfbuzz.headers.include_flags,
'-system-pcre', '-system-pcre',
'{0}'.format(pcre.libs.search_flags), pcre.libs.search_flags,
'{0}'.format(pcre.headers.include_flags) pcre.headers.include_flags
]) ])
if self.spec.satisfies('@5.7:'): if self.spec.satisfies('@5.7:'):
dc = self.spec['double-conversion'] dc = self.spec['double-conversion']
config_args.extend([ config_args.extend([
'-system-doubleconversion', '-system-doubleconversion',
'{0}'.format(dc.libs.search_flags), dc.libs.search_flags,
'{0}'.format(dc.headers.include_flags) dc.headers.include_flags
]) ])
if '@:5.7.1' in self.spec: if '@:5.7.1' in self.spec:
@ -389,18 +389,26 @@ def common_config_args(self):
else: else:
# FIXME: those could work for other versions # FIXME: those could work for other versions
png = self.spec['libpng'] png = self.spec['libpng']
jpeg = self.spec['jpeg'] config_args.append('-system-libpng')
zlib = self.spec['zlib'] if not png.external:
config_args.extend([ config_args.extend([
'-system-libpng', png.libs.search_flags,
'{0}'.format(png.libs.search_flags), png.headers.include_flags
'{0}'.format(png.headers.include_flags), ])
'-system-libjpeg',
'{0}'.format(jpeg.libs.search_flags), jpeg = self.spec['jpeg']
'{0}'.format(jpeg.headers.include_flags), config_args.append('-system-libjpeg')
'-system-zlib', if not jpeg.external:
'{0}'.format(zlib.libs.search_flags), config_args.extend([
'{0}'.format(zlib.headers.include_flags) jpeg.libs.search_flags,
jpeg.headers.include_flags,
])
zlib = self.spec['zlib']
config_args.append('-system-zlib')
if not zlib.external:
config_args.extend([
zlib.libs.search_flags,
zlib.headers.include_flags
]) ])
if '@:5.7.0' in self.spec: if '@:5.7.0' in self.spec: