From nobody Fri Nov 7 14:33:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548095223647792.1764509473361; Mon, 21 Jan 2019 10:27:03 -0800 (PST) Received: from localhost ([127.0.0.1]:57642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleHh-0003pE-Md for importer@patchew.org; Mon, 21 Jan 2019 13:26:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldy9-0004Pg-Sn for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldy9-0004DV-1F for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:45 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldy8-0004CB-RE for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:44 -0500 Received: by mail-wr1-x432.google.com with SMTP id r10so24429110wrs.10 for ; Mon, 21 Jan 2019 10:06:44 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.06.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4J8vLPkhbM91rNxAcF/gsXddRu+uP4y2FLMFMHqprdE=; b=pkJ1i9nfAiqKJWZ3LYhApLGIfJDxWHmdthUDDaVnKgosRZ2vcD02QRVrX8enxl8J7D 34DHiE+u56e/o2URonC9+ywVNZgMA0Te3xuBqeXJvdEzzqe/6QL2vYNDqqUPthSdJ0PU v/3Re59//XU2yvWzZpW5kfzdU00e7pNOEp7ITSlutLn1p6pzjEyRMsuPVecicXg+Ir5B hrAmYu/IhuZIfWY1N5VUT30o5s1da8qg2wLgb2eLSeEy7eBdN9U4yk9dfovY9e1QscWH pluMzJkdvQtIJLAOXZ+BQCfFVruK739fzmjcnYxRAg4R/ljhAcTYMYCAc0f3uwfdBl3s jCZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4J8vLPkhbM91rNxAcF/gsXddRu+uP4y2FLMFMHqprdE=; b=EPA4crmvMuR6/1ymXNOkg6LfMD/Gygfby7sbk4vUEjkqShzuz6bwrCa8JYQnsr6/jv CBnqQeiNbnxUyORxmYPKLc8NyCmgFmMKpI82b+ABX7ZUnSvz4qKhKxzbvSwuyXLaB1IA wpd/4HW0jUk8w+pJQpbZwaEBxoFNxNiTSSHkmmjbWrVoyn3Fl/utG3+jSxDMoahAfZJ0 vOM0IvUCaNG3f5rc+3bqm2LJa0v2F4t9ooJNEZXgbQZHcZuvDKiQFxiIVOVNAEAjEXea cGFypKEF0ju7azOInlLnFH48XAvjVEAxCMR9HUehL7xQvdciH1d7BME9OVqYCKTlXPH8 7kNw== X-Gm-Message-State: AJcUukcjdrGOg3w58xL0XUsv/9eQDF9dk9B96irX7Kvad9QWlsqzua0X PapCZI+RNRTekFIZpfDQSzTXkSkZ X-Google-Smtp-Source: ALg8bN7vCoKsiOw9K+AYBr6lHtnWV1ARvuPPzI++qJ7LJBA5kbnjhtfpwhr97Hhdisg9tF0Ov2L+pA== X-Received: by 2002:adf:8342:: with SMTP id 60mr27480211wrd.212.1548094003429; Mon, 21 Jan 2019 10:06:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:05:52 +0100 Message-Id: <1548093980-43088-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PULL 21/49] configure: Add a proper check for openpty() in libutil X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: 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 availability of this function. Buglink: https://bugs.launchpad.net/qemu/+bug/1777252 Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- 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=3D"$libs_qga -lrt" fi =20 -if test "$darwin" !=3D "yes" -a "$mingw32" !=3D "yes" -a "$solaris" !=3D y= es -a \ - "$haiku" !=3D "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=3D"-lutil $libs_softmmu" + libs_tools=3D"-lutil $libs_tools" + fi fi =20 ########################################## 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/str= ess$(EXESUF) rm $(INITRD_WORK_DIR)/init rmdir $(INITRD_WORK_DIR) =20 -ifeq ($(CONFIG_POSIX),y) -LIBS +=3D -lutil -endif - # QTest rules =20 TARGETS=3D$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) --=20 1.8.3.1