From nobody Thu Nov 13 03:23:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1576515193; cv=none; d=zohomail.com; s=zohoarc; b=DfGAIkjdackdr1tyXcpwqZqO/G6JRI6U/N/0ldth+2raYjIP0BKqM9cM9CSv68Nex3XWxe0OgwG6oWmn3/VJWai44msXQ5yhUZALPLr3MujkylH4z1ls+ueK7zb0MgSxKT3joU8gO1F3VfGDs0r7JUNK+Wvc8wSsa/hXNIqM0ao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576515193; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8QhwqaPFLSp6FHYlalgsR7gbeayOVVyGZFS6tWZHxJo=; b=lOSZa0STjwda5swk6+2SilEuQofghA6ukcgYYlVx1Qi6i6Sj33I1zGZCAgfzJyct2B+1rKxERTG/KXnkIhiRaT99SrJRtX956yfyWwsQZTF4lPhh8F8bwdUxT67nbQskFmNp/Kw6yBZbjwW3dVrQMOOAkzPyZ+gXzIskfYwzoc4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576515193055173.04550947249095; Mon, 16 Dec 2019 08:53:13 -0800 (PST) Received: from localhost ([::1]:56868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igtcN-0000NA-8b for importer@patchew.org; Mon, 16 Dec 2019 11:53:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57021) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igtFL-0005Mq-8X for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:29:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igtFK-0007yu-3n for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:29:23 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1igtFJ-0007w6-Tz for qemu-devel@nongnu.org; Mon, 16 Dec 2019 11:29:22 -0500 Received: by mail-wr1-x444.google.com with SMTP id y17so8050674wrh.5 for ; Mon, 16 Dec 2019 08:29:21 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q68sm19962334wme.14.2019.12.16.08.29.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 08:29:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8QhwqaPFLSp6FHYlalgsR7gbeayOVVyGZFS6tWZHxJo=; b=MwX6jkIEC6wEDHV1SZ1+JcP8fX/ZK1HD01hDXjtivjvRCQgmPlS8hIi2mYJvHUAMEE u/yu7k8KSqxOg+okHX/I8O6d47aqNm7XlXwX4p6f2UjodncGxuJey3NPbNlMJsWzAr+p jCtcyLQpjuRk/zo98FyUCjxQBcgIITwtdsPGG35DWrvVecOeMrPPXIMo8OmFaNCT7DRN JaogPei/zE8odMl4otlibktabWkbdmIzVPX6BhtmJGyn0eHB92n8vkExF/HiIkvVdEEq v7fgtO1SSBQrKIYcfXqrwFjk9cukmynUbV2SwLfPr/cSbIYv4+rs5UEp+Ybs4u4XBmi7 DdNQ== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8QhwqaPFLSp6FHYlalgsR7gbeayOVVyGZFS6tWZHxJo=; b=E7AQJLv7AvR6k7k/7v+JrHJMMoYIkmQu7lgauFsIdlywcydP6pMZPsQdGms8LBXKbQ 5XDD6Jp/hbCZS6Yl+L1erTHuDST7TjIsiFKZRCyjjJKBekO+F+n8vJxbE4HT/DpZhu54 fbzqsAV/vHqw4eYVYZSXdrDr2MRO92yy22cQrbIIAAOEXts9zm4zohlZvyX0qnSOF0G6 RM3oGn2CFp4bwr8610XaOZMfhUY0jfhAgEUkVBsfBA9FIdpF5S3xkFJNygkMjcqHGWsO 4qwE+2vJKmtepuO93557MH/imDiBKtr5ZBd4tdFX5ZqB9Hs/S8bgZbo4Js6pnfIxAdMa nBBQ== X-Gm-Message-State: APjAAAUqbI1q7wtVuahvU5PYBzdn1FJDqyMpvlPP5ApCFbVrT0IKTJtZ NljThe3quDQpo/FAYQ+YncrniAvj X-Google-Smtp-Source: APXvYqySCjL49ZgAn9Kr7jjPGkGQ+PI4drR8P4MR42F2QP9MQONbb5OP5iuWZSOuhGjzUj7saunEWg== X-Received: by 2002:a5d:6a52:: with SMTP id t18mr30171598wrw.391.1576513760786; Mon, 16 Dec 2019 08:29:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 33/62] build-sys: do not include Windows SLIRP dependencies in $LIBS Date: Mon, 16 Dec 2019 17:28:17 +0100 Message-Id: <1576513726-53700-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576513726-53700-1-git-send-email-pbonzini@redhat.com> References: <1576513726-53700-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::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When including the internal SLIRP library, we should add all the libraries = that it needs for the build. Right now they are all included by QEMU, but -liph= lpapi is not needed without slirp. Move it from LIBS to slirp_libs. Based on a patch by Marc-Andr=C3=A9 Lureau. Acked-by: Samuel Thibault Signed-off-by: Paolo Bonzini --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 2c72e04..8fb26ad 100755 --- a/configure +++ b/configure @@ -926,7 +926,7 @@ if test "$mingw32" =3D "yes" ; then DSOSUF=3D".dll" # MinGW needs -mthreads for TLS and macro _MT. QEMU_CFLAGS=3D"-mthreads $QEMU_CFLAGS" - LIBS=3D"-lwinmm -lws2_32 -liphlpapi $LIBS" + LIBS=3D"-lwinmm -lws2_32 $LIBS" write_c_skeleton; if compile_prog "" "-liberty" ; then LIBS=3D"-liberty $LIBS" @@ -6053,6 +6053,9 @@ case "$slirp" in mkdir -p slirp slirp_cflags=3D"-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" slirp_libs=3D"-L\$(BUILD_DIR)/slirp -lslirp" + if test "$mingw32" =3D "yes" ; then + slirp_libs=3D"$slirp_libs -lws2_32 -liphlpapi" + fi ;; =20 system) --=20 1.8.3.1