From cc06181ef9fd3083111b0dfc9a53e231522404b8 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 17 Aug 2020 15:22:25 -0500 Subject: ALSA-lib only works on Linux (#18075) --- var/spack/repos/builtin/packages/alsa-lib/package.py | 7 +++++-- var/spack/repos/builtin/packages/brltty/package.py | 2 +- var/spack/repos/builtin/packages/ffmpeg/package.py | 2 +- var/spack/repos/builtin/packages/icedtea/package.py | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/alsa-lib/package.py b/var/spack/repos/builtin/packages/alsa-lib/package.py index 9b53de24e9..a267f430e2 100644 --- a/var/spack/repos/builtin/packages/alsa-lib/package.py +++ b/var/spack/repos/builtin/packages/alsa-lib/package.py @@ -12,9 +12,10 @@ class AlsaLib(AutotoolsPackage): space library that developers compile ALSA applications against.""" homepage = "https://www.alsa-project.org" - url = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.2.2.tar.bz2" + url = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.2.3.2.tar.bz2" - version('1.2.2', sha256='d8e853d8805574777bbe40937812ad1419c9ea7210e176f0def3e6ed255ab3ec') + version('1.2.3.2', sha256='e81fc5b7afcaee8c9fd7f64a1e3043e88d62e9ad2c4cff55f578df6b0a9abe15') + version('1.2.2', sha256='d8e853d8805574777bbe40937812ad1419c9ea7210e176f0def3e6ed255ab3ec') version('1.1.4.1', sha256='91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76') variant('python', default=False, description='enable python') @@ -23,6 +24,8 @@ class AlsaLib(AutotoolsPackage): depends_on('python', type=('link', 'run'), when='+python') + conflicts('platform=darwin', msg='ALSA only works for Linux') + def configure_args(self): spec = self.spec args = [] diff --git a/var/spack/repos/builtin/packages/brltty/package.py b/var/spack/repos/builtin/packages/brltty/package.py index d31d7ae3bf..a5d047c954 100644 --- a/var/spack/repos/builtin/packages/brltty/package.py +++ b/var/spack/repos/builtin/packages/brltty/package.py @@ -24,7 +24,7 @@ class Brltty(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') depends_on('expat') - depends_on('alsa-lib', type='link') + depends_on('alsa-lib', when='platform=linux', type='link') def autoreconf(self, spec, prefix): bash = which('bash') diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index f268040ac2..ada37e8035 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -63,7 +63,7 @@ class Ffmpeg(AutotoolsPackage): variant('sdl2', default=False, description='sdl2 support') variant('shared', default=True, description='build shared libraries') - depends_on('alsa-lib') + depends_on('alsa-lib', when='platform=linux') depends_on('libiconv') depends_on('yasm@1.2.0:') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index 7f142ae4bf..9274251016 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -66,7 +66,7 @@ class Icedtea(AutotoolsPackage): depends_on('jpeg') depends_on('lcms') depends_on('zlib') - depends_on('alsa-lib') + depends_on('alsa-lib', when='platform=linux') provides('java@8', when='@3.4.0:3.99.99') -- cgit v1.2.3-60-g2f50