From nobody Sat May 18 23:44:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1598284380; cv=none; d=zohomail.com; s=zohoarc; b=NS2ajg1MQbGZVo8efOC3XellNdPtM8K1V6uXUrUhH/5msMAp6vw7TSjSaD2Q89QWlWx+6Z3XhfV/Swo+2LAjQHVjgD7IWIkrzlAuGzE9+dMmaT0lfVY5yDjLD7D43dr47OnEyw7ajhUcQ35UNnuPwAJMRP1DE5+9m9XEpP1LvQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598284380; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=F1sn/laxp6dAf4og/Kfuo7jRbt8JogQKNJWJbFTh5T8=; b=WlvFysAQWnaoXMXyff0JOlYDbiK/HGqvtvQbwc0x4buzJ1Y9ep9K8uyX+kvl2CTuqUo2KRx9OrnZ6lY+IluyGhPA0OWXs9JzTcaSnc1SRE3W7Mb321TIRwwq+HyRIlEbkndsv0E4iFaTlVLwYeHdX5NlkAxXmnUk+2K5wqSmHyc= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159828438003245.93499427423717; Mon, 24 Aug 2020 08:53:00 -0700 (PDT) Received: from localhost ([::1]:47158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAEmI-0002xj-QX for importer@patchew.org; Mon, 24 Aug 2020 11:52:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAElj-0002Wb-CO for qemu-devel@nongnu.org; Mon, 24 Aug 2020 11:52:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:58838) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAElh-00084M-5d for qemu-devel@nongnu.org; Mon, 24 Aug 2020 11:52:23 -0400 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 10F67AF0F; Mon, 24 Aug 2020 15:52:50 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Bruce Rogers To: qemu-devel@nongnu.org Subject: [PATCH] meson: Fix meson build with --enable-libdaxctl Date: Mon, 24 Aug 2020 09:52:12 -0600 Message-Id: <20200824155212.789568-1-brogers@suse.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=195.135.220.15; envelope-from=brogers@suse.com; helo=mx2.suse.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/24 01:06:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pbonzini@redhat.com, Bruce Rogers Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The daxctl library needs to be linked against when daxctl is asked for in configure. Signed-off-by: Bruce Rogers Reviewed-by: Marc-Andr=C3=A9 Lureau --- configure | 1 + meson.build | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 67832e3bab..15de7d10de 100755 --- a/configure +++ b/configure @@ -7488,6 +7488,7 @@ fi =20 if test "$libdaxctl" =3D "yes" ; then echo "CONFIG_LIBDAXCTL=3Dy" >> $config_host_mak + echo "LIBDAXCTL_LIBS=3D$libdaxctl_libs" >> $config_host_mak fi =20 if test "$bochs" =3D "yes" ; then diff --git a/meson.build b/meson.build index df5bf728b5..0a24e5c31a 100644 --- a/meson.build +++ b/meson.build @@ -380,6 +380,10 @@ if 'CONFIG_LIBPMEM' in config_host libpmem =3D declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS= '].split(), link_args: config_host['LIBPMEM_LIBS'].spli= t()) endif +libdaxctl =3D not_found +if 'CONFIG_LIBDAXCTL' in config_host + libdaxctl =3D declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'= ].split()) +endif =20 # Create config-host.h =20 @@ -786,7 +790,7 @@ common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') =20 -specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem) +specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem= , libdaxctl) specific_ss.add(files('exec-vary.c')) specific_ss.add(when: 'CONFIG_TCG', if_true: files( 'fpu/softfloat.c', --=20 2.28.0