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

Previous qt package file changes broke the openspeedshop gui build. (#15471)

Browse source 
* Previous qt changes broke the openspeedshop gui build.  This puts back the changes that caused the breakage.

* Update the qt version to be more robust.

Co-authored-by: Galarowicz, James <jgalarowicz@newmexicoconsortium.org>
This commit is contained in:
Jim Galarowicz 2020-03-18 08:45:17 -05:00 committed by GitHub
parent 847d5d3459
commit 586609102b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
var/spack/repos/builtin/packages/openspeedshop/package.py
View file

@ -96,7 +96,7 @@ class Openspeedshop(CMakePackage):
depends_on("libxml2") depends_on("libxml2")
depends_on("qt@3", when='gui=qt3') depends_on("qt@3:3.9", when='gui=qt3')
# Dependencies for the openspeedshop cbtf packages. # Dependencies for the openspeedshop cbtf packages.
depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run')) depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run'))

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

@ -132,9 +132,10 @@ class Qt(Package):
depends_on("sqlite+column_metadata", when='+sql%intel', type=('build', 'run')) depends_on("sqlite+column_metadata", when='+sql%intel', type=('build', 'run'))
depends_on("libpng@1.2.57", when='@3') depends_on("libpng@1.2.57", when='@3')
depends_on("libsm", when='@3')
depends_on("pcre+multibyte", when='@5.0:5.8') depends_on("pcre+multibyte", when='@5.0:5.8')
depends_on("inputproto", when='@:5.8') depends_on("inputproto", when='@:5.8')
depends_on("openssl@:1.0.999", when='@:5.9+ssl') depends_on("openssl@:1.0.999", when='@4:5.9+ssl')
depends_on("glib", when='@4:') depends_on("glib", when='@4:')
depends_on("libpng", when='@4:') depends_on("libpng", when='@4:')