From 613d0b7e8ed4bf5c2650b9796982651fc509dec1 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Sat, 26 Nov 2022 17:45:00 -0500 Subject: emacs: add variant treesitter for Emacs 29+ (#34134) --- var/spack/repos/builtin/packages/emacs/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 46e2b404b7..7874100485 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -37,6 +37,7 @@ class Emacs(AutotoolsPackage, GNUMirrorPackage): ) variant("tls", default=False, description="Build Emacs with gnutls") variant("native", default=False, description="enable native compilation of elisp") + variant("treesitter", default=False, description="Build with tree-sitter support") depends_on("pkgconfig", type="build") @@ -53,6 +54,7 @@ class Emacs(AutotoolsPackage, GNUMirrorPackage): depends_on("gtkplus", when="+X toolkit=gtk") depends_on("gnutls", when="+tls") depends_on("jpeg") + depends_on("tree-sitter", when="+treesitter") depends_on("m4", type="build", when="@master:") depends_on("autoconf", type="build", when="@master:") depends_on("automake", type="build", when="@master:") @@ -62,6 +64,7 @@ class Emacs(AutotoolsPackage, GNUMirrorPackage): conflicts("@:26.3", when="platform=darwin os=catalina") conflicts("+native", when="@:27", msg="native compilation require @master") + conflicts("+treesitter", when="@:28", msg="tree-sitter support requires version 29") @when("platform=darwin") def setup_build_environment(self, env): @@ -92,6 +95,9 @@ class Emacs(AutotoolsPackage, GNUMirrorPackage): else: args.append("--without-gnutls") + if "+treesitter" in spec: + args.append("--with-tree-sitter") + return args def _test_check_versions(self): -- cgit v1.2.3-60-g2f50