Skip to content

Commit

Permalink
Emacs: added gnutls variant (tested on Centos 7) (spack#6711)
Browse files Browse the repository at this point in the history
  • Loading branch information
PDoakORNL authored and alalazo committed Dec 19, 2017
1 parent 69f959e commit d4c84be
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions var/spack/repos/builtin/packages/emacs/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class Emacs(AutotoolsPackage):
values=('gtk', 'athena'),
description="Select an X toolkit (gtk, athena)"
)
variant('tls', default=False, description="Build Emacs with gnutls")

depends_on('pkgconfig', type='build')

Expand All @@ -55,6 +56,9 @@ class Emacs(AutotoolsPackage):
depends_on('libx11', when='+X')
depends_on('libxaw', when='+X toolkit=athena')
depends_on('gtkplus+X', when='+X toolkit=gtk')
depends_on('gnutls', when='+tls')
depends_on('libxpm ^gettext+libunistring', when='+tls')
depends_on('ncurses+termlib', when='+tls')

def configure_args(self):
spec = self.spec
Expand Down
8 changes: 8 additions & 0 deletions var/spack/repos/builtin/packages/ncurses/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class Ncurses(AutotoolsPackage):

variant('symlinks', default=False,
description='Enables symlinks. Needed on AFS filesystem.')
variant('termlib', default=False,
description='Enables termlib needs for gnutls in emacs.')

depends_on('pkgconfig', type='build')

Expand Down Expand Up @@ -71,6 +73,12 @@ def configure(self, spec, prefix):
if '+symlinks' in self.spec:
opts.append('--enable-symlinks')

if '+termlib' in self.spec:
opts.extend(('--with-termlib',
'--enable-termcap',
'--enable-getcap',
'--enable-tcap-names'))

prefix = '--prefix={0}'.format(prefix)

configure = Executable('../configure')
Expand Down

0 comments on commit d4c84be

Please sign in to comment.