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

Change dependencies to use virtual jpeg package (#12179)

Browse source 
This prevents conflicts between descendents that depend on an unintentional
arbitrary jpeg implementation.
This commit is contained in:
Seth R. Johnson 2019-07-29 13:08:55 -04:00 committed by Adam J. Stewart
parent a3f6f52622
commit 3d0b5bd541
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,7 @@ def url_for_version(self, version):
depends_on('mpi', when='+user-lb') depends_on('mpi', when='+user-lb')
depends_on('mpi', when='+user-h5md') depends_on('mpi', when='+user-h5md')
depends_on('hdf5', when='+user-h5md') depends_on('hdf5', when='+user-h5md')
depends_on('libjpeg', when='+jpeg') depends_on('jpeg', when='+jpeg')
depends_on('libpng', when='+png') depends_on('libpng', when='+png')
depends_on('ffmpeg', when='+ffmpeg') depends_on('ffmpeg', when='+ffmpeg')

2
var/spack/repos/builtin/packages/ncbi-toolkit/package.py
View file

@ -16,7 +16,7 @@ class NcbiToolkit(AutotoolsPackage):
depends_on('boost@1.35.0:') depends_on('boost@1.35.0:')
depends_on('bzip2') depends_on('bzip2')
depends_on('libjpeg') depends_on('jpeg')
depends_on('libpng') depends_on('libpng')
depends_on('libtiff') depends_on('libtiff')
depends_on('libxml2') depends_on('libxml2')

2
var/spack/repos/builtin/packages/r-tiff/package.py
View file

@ -17,5 +17,5 @@ class RTiff(RPackage):
version('0.1-5', '5052990b8647c77d3e27bc0ecf064e0b') version('0.1-5', '5052990b8647c77d3e27bc0ecf064e0b')
depends_on("libjpeg") depends_on("jpeg")
depends_on("libtiff") depends_on("libtiff")

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

@ -27,7 +27,7 @@ class Vigra(CMakePackage):
depends_on('libtiff', when='+tiff') depends_on('libtiff', when='+tiff')
depends_on('libpng', when='+png') depends_on('libpng', when='+png')
depends_on('libjpeg', when='+jpeg') depends_on('jpeg', when='+jpeg')
depends_on('hdf5', when='+hdf5') depends_on('hdf5', when='+hdf5')
depends_on('fftw', when='+fftw') depends_on('fftw', when='+fftw')
depends_on('openexr', when='+exr') depends_on('openexr', when='+exr')

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

@ -18,5 +18,5 @@ class Virtualgl(CMakePackage):
version('2.5.2', '1a9f404f4a35afa9f56381cb33ed210c') version('2.5.2', '1a9f404f4a35afa9f56381cb33ed210c')
depends_on("libjpeg-turbo") depends_on("jpeg")
depends_on("glu") depends_on("glu")

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

@ -87,7 +87,7 @@ class Vtk(CMakePackage):
depends_on('freetype') depends_on('freetype')
depends_on('glew') depends_on('glew')
depends_on('hdf5') depends_on('hdf5')
depends_on('libjpeg') depends_on('jpeg')
depends_on('jsoncpp') depends_on('jsoncpp')
depends_on('libxml2') depends_on('libxml2')
depends_on('lz4') depends_on('lz4')