diff options
| author | Alec Scott <hi@alecbcs.com> | 2024-09-25 18:37:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-25 19:37:27 -0600 |
| commit | 4eeb5b96658accab6466080daa6557bb176bafb5 (patch) | |
| tree | 7ea53c73d8df12b73ace7b71f288abf46078170c /var | |
| parent | 2778e530ad711e86411cb61db4417a2b74858664 (diff) | |
| download | spack-4eeb5b96658accab6466080daa6557bb176bafb5.tar.gz spack-4eeb5b96658accab6466080daa6557bb176bafb5.tar.bz2 spack-4eeb5b96658accab6466080daa6557bb176bafb5.tar.xz spack-4eeb5b96658accab6466080daa6557bb176bafb5.zip | |
emacs: fix dependency on texinfo when @29.4: (#46419)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/emacs/package.py | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 56200e29d9..3e428b74bc 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -55,28 +55,33 @@ class Emacs(AutotoolsPackage, GNUMirrorPackage): depends_on("c", type="build") depends_on("pkgconfig", type="build") depends_on("gzip", type="build") + depends_on("texinfo", type="build", when="@29.4:") depends_on("ncurses") depends_on("pcre") depends_on("zlib-api") depends_on("libxml2") - depends_on("libtiff", when="+X") - depends_on("libpng", when="+X") - depends_on("libxpm", when="+X") - depends_on("giflib", when="+X") - depends_on("libx11", when="+X") - depends_on("libxaw", when="+X toolkit=athena") - depends_on("gtkplus", when="+X toolkit=gtk") - depends_on("gnutls", when="+tls") depends_on("jpeg") + depends_on("gnutls", when="+tls") depends_on("tree-sitter", when="+treesitter") + depends_on("gcc@11: +strip languages=jit", when="+native") + depends_on("jansson@2.7:", when="+json") + + with when("+X"): + depends_on("libtiff") + depends_on("libpng") + depends_on("libxpm") + depends_on("giflib") + depends_on("libx11") + depends_on("libxaw", when="toolkit=athena") + depends_on("gtkplus", when="toolkit=gtk") + + # the following dependencies are required when building from a git ref + # so that we can run reconfigure to generate a ./configure script depends_on("m4", type="build", when="@master:") depends_on("autoconf", type="build", when="@master:") depends_on("automake", type="build", when="@master:") depends_on("libtool", type="build", when="@master:") - depends_on("texinfo", type="build", when="@master:") - depends_on("gcc@11: +strip languages=jit", when="+native") - depends_on("jansson@2.7:", when="+json") conflicts("@:26.3", when="platform=darwin os=catalina") |