configure: Add a proper check for openpty() in libutil
PATCH 1/1 configure: Add a proper check for openpty() in libutil
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 availablity of this function.
--- configure | 12 ++++++++++-- tests/Makefile.include | 4 ---- 2 files changed, 10 insertions(+), 6 deletions(-)
configure +10 -2
@@ -4595,9 +4595,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 ##########################################
tests/Makefile.include +0 -4
@@ -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)))
Signature · 1 line
1.8.3.1
Quoted 10 lines · Thomas Huth
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 availablity of this function.
Clean.
Quoted 18 lines
Signed-off-by Thomas Huth <[email protected]>--- configure | 12 ++++++++++-- tests/Makefile.include | 4 ---- 2 files changed, 10 insertions(+), 6 deletions(-)configure +0
-2@@ -4595,9 +4595,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
configure elif compile_prog "" "$pthread_lib -lrt" ; then · line 4607
Quoted 10 lines
configure +9
-0+# 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"
Quoted 20 lines
configure +1
-0+ fi fi ##########################################tests/Makefile.include +0
-4@@ -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)))
Quoted 10 lines · Thomas Huth
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 availablity of this function.
Interesting that you split "confi-" and "gure" across lines, I guess to appear less ragged.
s/availablity/availability/
Quoted 7 lines
Signed-off-by Thomas Huth <[email protected]>--- configure | 12 ++++++++++-- tests/Makefile.include | 4 ---- 2 files changed, 10 insertions(+), 6 deletions(-)
Feature-based testing is always better than hard-coded knowledge ;)
Quoted 4 lines
configure +2
-2-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
configure elif compile_prog "" "$pthread_lib -lrt" ; then · line 4609
Quoted 10 lines
configure +8
-0+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
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Paolo Bonzini
AppliedQuoted 48 lines · Thomas Huth
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 availablity of this function.Signed-off-by Thomas Huth <[email protected]>--- configure | 12 ++++++++++-- tests/Makefile.include | 4 ---- 2 files changed, 10 insertions(+), 6 deletions(-)configure +10
-2@@ -4595,9 +4595,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 ##########################################tests/Makefile.include +0
-0
tests/Makefile.include tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF) · line 798
Quoted 10 lines
tests/Makefile.include +0
-4@@ -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)))
Queued, thanks.
Paolo
Quoted 9 lines · Thomas Huth
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.
It also gets propagated to every tool binary we build even if it doesn't use openpty(), but I guess that's not a big deal.
thanks
-- PMM
Quoted 11 lines · Peter Maydell
Quoted 9 lines · Thomas Huth
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.
Quoted 2 lines
It also gets propagated to every tool binary we build even if it doesn't use
openpty(), but I guess that's not a big deal.
Statically linking against libraries only pulls in symbols that the library provides but which have not been satisfied earlier in the link line. For programs which do not use openpty(), and where no other unsatisfied symbols remain which -lutil would satisfy in a shadowing effect on symbols normally provided by remaining libraries on the command line, then yeah, it shouldn't change the compiled size of those binaries. Dynamic linking might change the binary slightly because of tracking that the library was linked, but again the behavior shouldn't change.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org