[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/49] configure: Add a proper check for openpty() in
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 21/49] configure: Add a proper check for openpty() in libutil |
Date: |
Mon, 21 Jan 2019 19:05:52 +0100 |
From: Thomas Huth <address@hidden>
On Linux (and maybe some BSDs), we require libutil for the openpty()
function. However, this library is not available on some other systems, so
we currently use a fragile if-statement in the configure script to check
whether we need the library or not. Unfortunately, we also hard-coded a
"-lutil" in the tests/Makefile.include file, so this breaks the build on
Solaris, for example (see buglink below). To fix the issue, add the "-lutil"
to "libs_tools" in the configure script instead, then this gets properly
propagated to the tests, too.
And while we're at it, also replace the fragile if-statement in the confi-
gure script with a proper link-check for the availability of this function.
Buglink: https://bugs.launchpad.net/qemu/+bug/1777252
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 12 ++++++++++--
tests/Makefile.include | 4 ----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 868614e..6a4d23c 100755
--- a/configure
+++ b/configure
@@ -4621,9 +4621,17 @@ elif compile_prog "" "$pthread_lib -lrt" ; then
libs_qga="$libs_qga -lrt"
fi
-if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
- "$haiku" != "yes" ; then
+# Check whether we need to link libutil for openpty()
+cat > $TMPC << EOF
+extern int openpty(int *am, int *as, char *name, void *termp, void *winp);
+int main(void) { return openpty(0, 0, 0, 0, 0); }
+EOF
+
+if ! compile_prog "" "" ; then
+ if compile_prog "" "-lutil" ; then
libs_softmmu="-lutil $libs_softmmu"
+ libs_tools="-lutil $libs_tools"
+ fi
fi
##########################################
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 443ac4d..2fe2ab7 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -793,10 +793,6 @@ tests/migration/initrd-stress.img:
tests/migration/stress$(EXESUF)
rm $(INITRD_WORK_DIR)/init
rmdir $(INITRD_WORK_DIR)
-ifeq ($(CONFIG_POSIX),y)
-LIBS += -lutil
-endif
-
# QTest rules
TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
--
1.8.3.1
- [Qemu-devel] [PULL 19/49] cpu-exec: add assert_no_pages_locked() after longjmp, (continued)
- [Qemu-devel] [PULL 19/49] cpu-exec: add assert_no_pages_locked() after longjmp, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 14/49] vhost-user-test: create a main loop per TestServer, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 20/49] cpu-exec: reset BQL after longjmp in cpu_exec_step_atomic, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 12/49] vhost-user-test: skip if there is no memory at address 0, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 03/49] vhost-net: move stubs to a separate file, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 13/49] vhost-user-test: reduce usage of global_qtest, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 05/49] vhost: restrict Linux dependency to kernel vhost, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 15/49] vhost-user-test: small changes to init_hugepagefs, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 16/49] vhost-user-test: create a temporary directory per TestServer, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 18/49] tests/hexloader-test: Don't pass -nographic to the QEMU under test, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 21/49] configure: Add a proper check for openpty() in libutil,
Paolo Bonzini <=
- [Qemu-devel] [PULL 22/49] cpus: ignore ESRCH in qemu_cpu_kick_thread(), Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 24/49] elf-ops.h: Add get_elf_note_type(), Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 25/49] pvh: Add x86/HVM direct boot ABI header file, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 28/49] linuxboot_dma: remove duplicate definitions of FW_CFG, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 23/49] elf: Add optional function ptr to load_elf() to parse ELF notes, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 31/49] optionrom/pvh: load initrd from fw_cfg, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 32/49] i386: remove the new CPUID 'PCONFIG' from Icelake-Server CPU model, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 36/49] contrib/elf2dmp: fix elf.h including, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 30/49] hw/i386/pc: use PVH option rom, Paolo Bonzini, 2019/01/21
- [Qemu-devel] [PULL 39/49] contrib/elf2dmp: fix structures definitions, Paolo Bonzini, 2019/01/21