summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGeorge Hartzell <hartzell@alerce.com>2017-07-31 09:17:04 -0700
committerAdam J. Stewart <ajstewart426@gmail.com>2017-07-31 11:17:04 -0500
commitc126c5553c81c1ab150b4ccefd6cba7507f20530 (patch)
treee9431d61fcad16b99cee90c950d65acb929443e3 /var
parent6d97397ab00d4b73334bb44fa9e5541a8998dde6 (diff)
downloadspack-c126c5553c81c1ab150b4ccefd6cba7507f20530.tar.gz
spack-c126c5553c81c1ab150b4ccefd6cba7507f20530.tar.bz2
spack-c126c5553c81c1ab150b4ccefd6cba7507f20530.tar.xz
spack-c126c5553c81c1ab150b4ccefd6cba7507f20530.zip
zsh: add variant that skips tcsetpgrp test (#4923)
zsh's configure script fails if there's it tries to test for terminal functionality if there's not a terminal (e.g. in a Jenkins build). The configure script has a switch that asserts that tcsetpgrp works and thereby avoids running that test. This commit adds a variant that invokes that switch, defaulting to True.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/zsh/package.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py
index 7a298d16b5..7225418363 100644
--- a/var/spack/repos/builtin/packages/zsh/package.py
+++ b/var/spack/repos/builtin/packages/zsh/package.py
@@ -37,5 +37,21 @@ class Zsh(AutotoolsPackage):
version('5.3.1', checksum='d583fbca0c2410bf9542ce8a651c26ca')
version('5.1.1', checksum='8ba28a9ef82e40c3a271602f18343b2f')
+ # Testing for terminal related things causes failures in e.g. Jenkins.
+ # See e.g. https://www.zsh.org/mla/users/2003/msg00845.html,
+ # although the name of the option has evolved since then.
+ variant('skip-tcsetpgrp-test', default=True,
+ description="Skip configure's tcsetpgrp test")
+
depends_on("pcre")
depends_on("ncurses")
+
+ def configure_args(self):
+ if '+skip-tcsetpgrp-test' in self.spec:
+ # assert that we have a functional tcsetpgrp
+ args = ['--with-tcsetpgrp']
+ else:
+ # let configure run it's test and see what's what
+ args = []
+
+ return args