zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emacs: added gnutls variant (tested on Centos 7) (#6711)

Browse Source
This commit is contained in:
Peter Doak 2017-12-19 02:36:54 -05:00 committed by Massimiliano Culpo
parent 69f959ec0b
commit d4c84be91b
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/emacs/package.py
View File

@ -43,6 +43,7 @@ class Emacs(AutotoolsPackage):
values=('gtk', 'athena'), values=('gtk', 'athena'),
description="Select an X toolkit (gtk, athena)" description="Select an X toolkit (gtk, athena)"
) )
variant('tls', default=False, description="Build Emacs with gnutls")
depends_on('pkgconfig', type='build') depends_on('pkgconfig', type='build')
@ -55,6 +56,9 @@ class Emacs(AutotoolsPackage):
depends_on('libx11', when='+X') depends_on('libx11', when='+X')
depends_on('libxaw', when='+X toolkit=athena') depends_on('libxaw', when='+X toolkit=athena')
depends_on('gtkplus+X', when='+X toolkit=gtk') 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): def configure_args(self):
spec = self.spec spec = self.spec

8
var/spack/repos/builtin/packages/ncurses/package.py
View File

@ -44,6 +44,8 @@ class Ncurses(AutotoolsPackage):
variant('symlinks', default=False, variant('symlinks', default=False,
description='Enables symlinks. Needed on AFS filesystem.') description='Enables symlinks. Needed on AFS filesystem.')
variant('termlib', default=False,
description='Enables termlib needs for gnutls in emacs.')
depends_on('pkgconfig', type='build') depends_on('pkgconfig', type='build')
@ -71,6 +73,12 @@ def configure(self, spec, prefix):
if '+symlinks' in self.spec: if '+symlinks' in self.spec:
opts.append('--enable-symlinks') 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) prefix = '--prefix={0}'.format(prefix)
configure = Executable('../configure') configure = Executable('../configure')