summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2017-03-14 09:45:17 -0500
committerTodd Gamblin <tgamblin@llnl.gov>2017-03-14 07:45:17 -0700
commit64bd7adefabc76a6b1337ce3b9c678c4af84ae6e (patch)
treed6e8a17ccf69cd431ce1278ae86d3ed67fc9bea3 /var
parent5430d45db18f064741b86e6f61d0b03f17baf718 (diff)
downloadspack-64bd7adefabc76a6b1337ce3b9c678c4af84ae6e.tar.gz
spack-64bd7adefabc76a6b1337ce3b9c678c4af84ae6e.tar.bz2
spack-64bd7adefabc76a6b1337ce3b9c678c4af84ae6e.tar.xz
spack-64bd7adefabc76a6b1337ce3b9c678c4af84ae6e.zip
Fix vim ~gui behavior (#3432)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/vim/package.py22
1 files changed, 15 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py
index c89bc6cb8f..1ac0ce5186 100644
--- a/var/spack/repos/builtin/packages/vim/package.py
+++ b/var/spack/repos/builtin/packages/vim/package.py
@@ -25,7 +25,7 @@
from spack import *
-class Vim(Package):
+class Vim(AutotoolsPackage):
"""Vim is a highly configurable text editor built to enable efficient text
editing. It is an improved version of the vi editor distributed with most
UNIX systems. Vim is often called a "programmer's editor," and so useful
@@ -37,6 +37,7 @@ class Vim(Package):
homepage = "http://www.vim.org"
url = "https://github.com/vim/vim/archive/v8.0.0134.tar.gz"
+ version('8.0.0454', '4030bf677bdfbd14efb588e4d9a24128')
version('8.0.0134', 'c74668d25c2acc85d655430dd60886cd')
version('7.4.2367', 'a0a7bc394f7ab1d95571fe6ab05da3ea')
@@ -59,12 +60,15 @@ class Vim(Package):
variant('cscope', default=False, description="build with cscope support")
depends_on('cscope', when='+cscope', type='run')
+ # TODO: Once better support for multi-valued variants is added, add
+ # support for auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/photon/carbon
variant('gui', default=False, description="build with gui (gvim)")
- # virtual dependency?
+ variant('x', default=False, description="use the X Window System")
depends_on('ncurses', when="@7.4:")
- def install(self, spec, prefix):
+ def configure_args(self):
+ spec = self.spec
feature_set = None
for fs in self.feature_sets:
if "+" + fs in spec:
@@ -110,11 +114,15 @@ class Vim(Package):
if '+gui' in spec:
configure_args.append("--enable-gui=auto")
+ else:
+ configure_args.append("--enable-gui=no")
+
+ if '+x' in spec:
+ configure_args.append("--with-x")
+ else:
+ configure_args.append("--without-x")
if '+cscope' in spec:
configure_args.append("--enable-cscope")
- configure("--prefix=%s" % prefix, *configure_args)
-
- make()
- make("install")
+ return configure_args