From 36e9c1eba3daf4260f62b6ed4471d535bd11fa38 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 19 Sep 2020 16:29:27 -0500 Subject: [PATCH] fish: relax ncurses dependency constraints (#18796) --- var/spack/repos/builtin/packages/fish/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py index 97cb2654ddc..385c925e9ff 100644 --- a/var/spack/repos/builtin/packages/fish/package.py +++ b/var/spack/repos/builtin/packages/fish/package.py @@ -23,7 +23,7 @@ class Fish(CMakePackage): # https://github.com/fish-shell/fish-shell#dependencies-1 depends_on('cmake@3.2:', type='build') - depends_on('ncurses~termlib') + depends_on('ncurses') depends_on('pcre2@10.21:') depends_on('gettext') depends_on('py-sphinx', when='+docs', type='build') @@ -41,6 +41,9 @@ def determine_version(cls, exe): match = re.search(r'fish, version (\S+)', output) return match.group(1) if match else None + def setup_build_environment(self, env): + env.append_flags('LDFLAGS', self.spec['ncurses'].libs.link_flags) + def cmake_args(self): args = [ '-DBUILD_SHARED_LIBS=ON',