aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2011-11-03 14:56:13 -0600
committerEric Blake <eblake@redhat.com>2011-11-07 09:34:02 -0700
commitf7bd00c12cace027083d6c46818aa2147e479bca (patch)
tree991543a69d8043bf1d26eedb522335bd0bbadfb2 /bootstrap.conf
parentAdd missing defaultConsoleTargetType callback for AppArmour (diff)
downloadlibvirt-f7bd00c12cace027083d6c46818aa2147e479bca.tar.gz
libvirt-f7bd00c12cace027083d6c46818aa2147e479bca.tar.bz2
libvirt-f7bd00c12cace027083d6c46818aa2147e479bca.zip
build: fix build on platforms without ptsname_r
MacOS lacks ptsname_r, and gnulib doesn't (yet) provide it. But we can avoid it altogether, by using gnulib openpty() instead. Note that we do _not_ want the pt_chown module; gnulib uses it only to implement a replacement openpty() if the system lacks both openpty() and granpt(), but all systems that we currently port to either have at least one of openpty() and/or grantpt(), or lack ptys altogether. That is, we aren't porting to any system that requires us to deal with the hassle of installing a setuid pt_chown helper just to use gnulib's ability to provide openpty() on obscure platforms. * .gnulib: Update to latest, for openpty fixes * bootstrap.conf (gnulib_modules): Add openpty, ttyname_r. (gnulib_tool_option_extras): Exclude pt_chown module. * src/util/util.c (virFileOpenTty): Rewrite in terms of openpty and ttyname_r. * src/util/util.h (virFileOpenTtyAt): Delete dead prototype.
Diffstat (limited to 'bootstrap.conf')
-rw-r--r--bootstrap.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/bootstrap.conf b/bootstrap.conf
index 0faa2e221..4557d2da9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -68,6 +68,7 @@ mkstemps
mktempd
netdb
nonblocking
+openpty
passfd
perror
physmem
@@ -101,6 +102,7 @@ sys_wait
termios
time_r
timegm
+ttyname_r
uname
useless-if-before-free
usleep
@@ -168,6 +170,7 @@ tests_base=gnulib/tests
gnulib_tool_option_extras="\
--lgpl=2\
--with-tests\
+ --avoid=pt_chown\
"
# Convince bootstrap to use multiple m4 directories.