From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 465EAC76195 for ; Fri, 19 Jul 2019 13:27:01 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1D3EB21849 for ; Fri, 19 Jul 2019 13:27:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D3EB21849 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoSua-0007EB-3Y for qemu-devel@archiver.kernel.org; Fri, 19 Jul 2019 09:27:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35187) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoStd-0003G3-U9 for qemu-devel@nongnu.org; Fri, 19 Jul 2019 09:26:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoStc-0007yn-V9 for qemu-devel@nongnu.org; Fri, 19 Jul 2019 09:26:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58522) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hoStc-0007yS-QC for qemu-devel@nongnu.org; Fri, 19 Jul 2019 09:26:00 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A98E3091740; Fri, 19 Jul 2019 13:26:00 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-48.ams2.redhat.com [10.36.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id F132E5D704; Fri, 19 Jul 2019 13:25:58 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 19 Jul 2019 14:25:47 +0100 Message-Id: <20190719132549.14726-4-berrange@redhat.com> In-Reply-To: <20190719132549.14726-1-berrange@redhat.com> References: <20190719132549.14726-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 19 Jul 2019 13:26:00 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/5] configure: only link capstone to emulation targets 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: , Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Only the emulators link to code that uses capstone, so adding it to the global LIBs places undesirable dependancies on other binaries, in particular the tools. There is no variable that covers both user emulation and machine emulation, so add a new "$libs_cpu" for this purpose. In particular this removes the 8 MB capstone dep from the things qemu-img links against, allowing for a more minimal installation in scenarios that don't want system emulators installed. Reviewed-by: Richard Henderson Signed-off-by: Daniel P. Berrang=C3=A9 --- Makefile.target | 1 + configure | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.target b/Makefile.target index 85216cace8..933b27453a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -120,6 +120,7 @@ obj-$(CONFIG_TCG) +=3D fpu/softfloat.o obj-y +=3D target/$(TARGET_BASE_ARCH)/ obj-y +=3D disas.o obj-$(call notempty,$(TARGET_XML_FILES)) +=3D gdbstub-xml.o +LIBS :=3D $(libs_cpu) $(LIBS) =20 ######################################################### # Linux user emulator target diff --git a/configure b/configure index eb635c3b9a..99c64be6b7 100755 --- a/configure +++ b/configure @@ -294,6 +294,7 @@ audio_drv_list=3D"" block_drv_rw_whitelist=3D"" block_drv_ro_whitelist=3D"" host_cc=3D"cc" +libs_cpu=3D"" libs_softmmu=3D"" libs_tools=3D"" audio_pt_int=3D"" @@ -5042,12 +5043,12 @@ case "$capstone" in else LIBCAPSTONE=3Dlibcapstone.a fi - LIBS=3D"-L\$(BUILD_DIR)/capstone -lcapstone $LIBS" + libs_cpu=3D"-L\$(BUILD_DIR)/capstone -lcapstone $libs_cpu" ;; =20 system) QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags capstone)" - LIBS=3D"$($pkg_config --libs capstone) $LIBS" + libs_cpu=3D"$($pkg_config --libs capstone) $libs_cpu" ;; =20 no) @@ -6537,6 +6538,7 @@ echo "qemu_helperdir=3D$libexecdir" >> $config_host= _mak echo "qemu_localedir=3D$qemu_localedir" >> $config_host_mak echo "qemu_icondir=3D$qemu_icondir" >> $config_host_mak echo "qemu_desktopdir=3D$qemu_desktopdir" >> $config_host_mak +echo "libs_cpu=3D$libs_cpu" >> $config_host_mak echo "libs_softmmu=3D$libs_softmmu" >> $config_host_mak echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak --=20 2.21.0