From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkBrU-0006Ry-IX for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:53:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkBrT-0002LK-Ax for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:53:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56472) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gkBrS-0002Gm-Fd for qemu-devel@nongnu.org; Thu, 17 Jan 2019 12:53:50 -0500 References: <1547745248-1750-1-git-send-email-thuth@redhat.com> From: Paolo Bonzini Message-ID: Date: Thu, 17 Jan 2019 18:53:45 +0100 MIME-Version: 1.0 In-Reply-To: <1547745248-1750-1-git-send-email-thuth@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] configure: Add a proper check for openpty() in libutil List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , qemu-devel@nongnu.org Cc: Peter Maydell , Eric Blake On 17/01/19 18:14, Thomas Huth wrote: > 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. > > Buglink: https://bugs.launchpad.net/qemu/+bug/1777252 > Signed-off-by: Thomas Huth > --- > configure | 12 ++++++++++-- > tests/Makefile.include | 4 ---- > 2 files changed, 10 insertions(+), 6 deletions(-) > > diff --git a/configure b/configure > index 3c28bae..0f4e42a 100755 > --- a/configure > +++ b/configure > @@ -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 > > ########################################## > diff --git a/tests/Makefile.include b/tests/Makefile.include > index f403a65..8f8e3b4 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))) > Queued, thanks. Paolo