summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorVanessasaurus <814322+vsoch@users.noreply.github.com>2021-08-25 23:39:46 -0600
committerGitHub <noreply@github.com>2021-08-26 07:39:46 +0200
commit4ddc0ff218d5ed0968f6efb0fac855b1b7127375 (patch)
tree131fa8eb19c9ffe0b677b4515a4a97d1735c81d1 /var
parent73005166efdc9be8d0095cb32360cced04b923b4 (diff)
downloadspack-4ddc0ff218d5ed0968f6efb0fac855b1b7127375.tar.gz
spack-4ddc0ff218d5ed0968f6efb0fac855b1b7127375.tar.bz2
spack-4ddc0ff218d5ed0968f6efb0fac855b1b7127375.tar.xz
spack-4ddc0ff218d5ed0968f6efb0fac855b1b7127375.zip
fixing bugs with new package updates for samtools and abi-dum (#25615)
samtools needed more constraints for htslib, and abi-dumper was missing pkg-config on the dependency universal ctags Signed-off-by: vsoch <vsoch@users.noreply.github.com> Co-authored-by: vsoch <vsoch@users.noreply.github.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/samtools/package.py2
-rw-r--r--var/spack/repos/builtin/packages/universal-ctags/package.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py
index c7db0c0157..dff0dbfbb0 100644
--- a/var/spack/repos/builtin/packages/samtools/package.py
+++ b/var/spack/repos/builtin/packages/samtools/package.py
@@ -33,7 +33,9 @@ class Samtools(Package):
depends_on('python', type='run')
# htslib became standalone @1.3.1, must use corresponding version
+ depends_on('htslib@1.13', when='@1.13')
depends_on('htslib@1.12', when='@1.12')
+ depends_on('htslib@1.11', when='@1.11')
depends_on('htslib@1.10.2', when='@1.10')
depends_on('htslib@1.9', when='@1.9')
depends_on('htslib@1.8', when='@1.8')
diff --git a/var/spack/repos/builtin/packages/universal-ctags/package.py b/var/spack/repos/builtin/packages/universal-ctags/package.py
index 0f37f69264..4be0b3fcb6 100644
--- a/var/spack/repos/builtin/packages/universal-ctags/package.py
+++ b/var/spack/repos/builtin/packages/universal-ctags/package.py
@@ -22,3 +22,4 @@ class UniversalCtags(AutotoolsPackage):
depends_on('libtool', type='build')
depends_on('m4', type='build')
depends_on('libiconv', type='link')
+ depends_on('pkg-config', type='build')