From 3d0b5bd54133e5949b43d6c3ff12c6ce61b701a8 Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Mon, 29 Jul 2019 13:08:55 -0400 Subject: [PATCH] Change dependencies to use virtual jpeg package (#12179) This prevents conflicts between descendents that depend on an unintentional arbitrary jpeg implementation. --- var/spack/repos/builtin/packages/lammps/package.py | 2 +- var/spack/repos/builtin/packages/ncbi-toolkit/package.py | 2 +- var/spack/repos/builtin/packages/r-tiff/package.py | 2 +- var/spack/repos/builtin/packages/vigra/package.py | 2 +- var/spack/repos/builtin/packages/virtualgl/package.py | 2 +- var/spack/repos/builtin/packages/vtk/package.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index 9110152919..0d8d289a75 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -85,7 +85,7 @@ def url_for_version(self, version): depends_on('mpi', when='+user-lb') depends_on('mpi', 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('ffmpeg', when='+ffmpeg') diff --git a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py index bc4c57ae4a..99fd7a7d94 100644 --- a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py +++ b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py @@ -16,7 +16,7 @@ class NcbiToolkit(AutotoolsPackage): depends_on('boost@1.35.0:') depends_on('bzip2') - depends_on('libjpeg') + depends_on('jpeg') depends_on('libpng') depends_on('libtiff') depends_on('libxml2') diff --git a/var/spack/repos/builtin/packages/r-tiff/package.py b/var/spack/repos/builtin/packages/r-tiff/package.py index 0dbe0d66a7..596d058754 100644 --- a/var/spack/repos/builtin/packages/r-tiff/package.py +++ b/var/spack/repos/builtin/packages/r-tiff/package.py @@ -17,5 +17,5 @@ class RTiff(RPackage): version('0.1-5', '5052990b8647c77d3e27bc0ecf064e0b') - depends_on("libjpeg") + depends_on("jpeg") depends_on("libtiff") diff --git a/var/spack/repos/builtin/packages/vigra/package.py b/var/spack/repos/builtin/packages/vigra/package.py index 9746f2adbb..02686ffb4c 100644 --- a/var/spack/repos/builtin/packages/vigra/package.py +++ b/var/spack/repos/builtin/packages/vigra/package.py @@ -27,7 +27,7 @@ class Vigra(CMakePackage): depends_on('libtiff', when='+tiff') depends_on('libpng', when='+png') - depends_on('libjpeg', when='+jpeg') + depends_on('jpeg', when='+jpeg') depends_on('hdf5', when='+hdf5') depends_on('fftw', when='+fftw') depends_on('openexr', when='+exr') diff --git a/var/spack/repos/builtin/packages/virtualgl/package.py b/var/spack/repos/builtin/packages/virtualgl/package.py index bf4352f04a..b279c7bcf9 100644 --- a/var/spack/repos/builtin/packages/virtualgl/package.py +++ b/var/spack/repos/builtin/packages/virtualgl/package.py @@ -18,5 +18,5 @@ class Virtualgl(CMakePackage): version('2.5.2', '1a9f404f4a35afa9f56381cb33ed210c') - depends_on("libjpeg-turbo") + depends_on("jpeg") depends_on("glu") diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 9c2bb73394..82cd423e4f 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -87,7 +87,7 @@ class Vtk(CMakePackage): depends_on('freetype') depends_on('glew') depends_on('hdf5') - depends_on('libjpeg') + depends_on('jpeg') depends_on('jsoncpp') depends_on('libxml2') depends_on('lz4')