From patchwork Mon Dec 16 16:28:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1210574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MwX6jkIE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47c6ks3HT2z9sNH for ; Tue, 17 Dec 2019 03:52:21 +1100 (AEDT) Received: from localhost ([::1]:56860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igtbW-0007AY-R5 for incoming@patchwork.ozlabs.org; Mon, 16 Dec 2019 11:52:18 -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) 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) 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) 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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 -liphlpapi is not needed without slirp. Move it from LIBS to slirp_libs. Based on a patch by Marc-André 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" = "yes" ; then DSOSUF=".dll" # MinGW needs -mthreads for TLS and macro _MT. QEMU_CFLAGS="-mthreads $QEMU_CFLAGS" - LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS" + LIBS="-lwinmm -lws2_32 $LIBS" write_c_skeleton; if compile_prog "" "-liberty" ; then LIBS="-liberty $LIBS" @@ -6053,6 +6053,9 @@ case "$slirp" in mkdir -p slirp slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp" + if test "$mingw32" = "yes" ; then + slirp_libs="$slirp_libs -lws2_32 -liphlpapi" + fi ;; system)