From 1c843b99ae81626f00bbb48a29f8c65d49e6f863 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 19 Dec 2024 04:50:38 -0600 Subject: [PATCH] Replace lzma with xz dependency (#39404) --- var/spack/repos/builtin/packages/angsd/package.py | 2 +- var/spack/repos/builtin/packages/eagle/package.py | 2 +- var/spack/repos/builtin/packages/kmod/package.py | 2 +- var/spack/repos/builtin/packages/rpm/package.py | 1 - .../builtin/packages/srcml-identifier-getter-tool/package.py | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/angsd/package.py b/var/spack/repos/builtin/packages/angsd/package.py index 98ce30c1bac..c43f5c8cc5e 100644 --- a/var/spack/repos/builtin/packages/angsd/package.py +++ b/var/spack/repos/builtin/packages/angsd/package.py @@ -31,7 +31,7 @@ class Angsd(MakefilePackage): conflicts("^htslib@1.6:", when="@0.919") depends_on("zlib-api") - depends_on("lzma") + depends_on("xz") depends_on("curl") depends_on("r", type="run", when="+r") diff --git a/var/spack/repos/builtin/packages/eagle/package.py b/var/spack/repos/builtin/packages/eagle/package.py index 3abe19fb371..c89c58267e7 100644 --- a/var/spack/repos/builtin/packages/eagle/package.py +++ b/var/spack/repos/builtin/packages/eagle/package.py @@ -22,7 +22,7 @@ class Eagle(MakefilePackage): depends_on("curl") depends_on("zlib-api") - depends_on("lzma") + depends_on("xz") depends_on("htslib") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/kmod/package.py b/var/spack/repos/builtin/packages/kmod/package.py index b017ff986b0..7f0c224e3d5 100644 --- a/var/spack/repos/builtin/packages/kmod/package.py +++ b/var/spack/repos/builtin/packages/kmod/package.py @@ -28,7 +28,7 @@ class Kmod(AutotoolsPackage): depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("pkgconfig", type="build") - depends_on("lzma") + depends_on("xz") def autoreconf(self, spec, prefix): bash = which("bash") diff --git a/var/spack/repos/builtin/packages/rpm/package.py b/var/spack/repos/builtin/packages/rpm/package.py index 39d2d44af4d..992c7939b55 100644 --- a/var/spack/repos/builtin/packages/rpm/package.py +++ b/var/spack/repos/builtin/packages/rpm/package.py @@ -94,7 +94,6 @@ class Rpm(AutotoolsPackage): depends_on("bzip2") depends_on("gzip") depends_on("xz") - depends_on("lzma") with when("+zstd"): depends_on("zstd") depends_on("zstd@1.3.8:", when="@4.17:") diff --git a/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py b/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py index ec2225bc844..428a40c6b60 100644 --- a/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py +++ b/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py @@ -20,7 +20,7 @@ class SrcmlIdentifierGetterTool(CMakePackage): depends_on("libxml2") depends_on("zlib-api") - depends_on("lzma") + depends_on("xz") def install(self, spec, prefix): super().install(spec, prefix)