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

qt: fix build with ~ssl. (#17767)

Browse Source 
OpenSSL was pulled from the spec too early, leading to failures when
attempting to build with ~ssl.
This commit is contained in:
Matthias Wolf 2020-07-29 19:53:01 +02:00 committed by GitHub
parent d1494fe8da
commit 90648bb477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,7 +363,6 @@ def patch(self):
@property @property
def common_config_args(self): def common_config_args(self):
# incomplete list is here http://doc.qt.io/qt-5/configure-options.html # incomplete list is here http://doc.qt.io/qt-5/configure-options.html
openssl = self.spec['openssl']
config_args = [ config_args = [
'-prefix', self.prefix, '-prefix', self.prefix,
'-v', '-v',
@ -389,6 +388,7 @@ def common_config_args(self):
config_args.append('-no-freetype') config_args.append('-no-freetype')
if '+ssl' in self.spec: if '+ssl' in self.spec:
openssl = self.spec['openssl']
config_args.extend([ config_args.extend([
'-openssl-linked', '-openssl-linked',
openssl.libs.search_flags, openssl.libs.search_flags,