From nobody Tue Dec 16 11:13:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597080395; cv=none; d=zohomail.com; s=zohoarc; b=bUo6Tgfgpbh5kfLOwuA/JMUzqml/+amm8SK7PC6n2JERo1zfR1hz+2khhnpxgSH9nC0LhJch2smdSJOkYyjxXYgD6HuI3TD+1/xwfsiolzX9BEBROS7g0kJ+AldRmSzGMOPr5BcsbyYP8wVU+ZP3JE+BNKy8EeLhzhERNml2W28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080395; h=Content-Type:Content-Transfer-Encoding:Cc: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=Fo6O0ovTU5D6Q9dGU5S0TBVBQNhgDO+eSN7thZzLfLY=; b=SIOMz5+j0KBF2TdLBz/qmCpwiDdQKa7T7ndYTcEjpFazideF6hwxzBKCOskaxSxe6Ui1JUZaV1HgVmp46M3q4jUqbEsJN+ND7P4O47riCu6ZCOOgrxbeJh0HLiT9/xTY3+P8gApf2T5aqcXpeNpQFQ4Ojj5hwMz/pDNb4jTaoIs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1597080395112974.3554061752083; Mon, 10 Aug 2020 10:26:35 -0700 (PDT) Received: from localhost ([::1]:54220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BZB-0005ds-OA for importer@patchew.org; Mon, 10 Aug 2020 13:26:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJO-0007CR-7x for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34882 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJL-0002oP-Lq for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:13 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-355-pL7hoiZ2Py2oK9pg5KdCKw-1; Mon, 10 Aug 2020 13:10:09 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FC2480048A for ; Mon, 10 Aug 2020 17:10:08 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DA3D5F1E9; Mon, 10 Aug 2020 17:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fo6O0ovTU5D6Q9dGU5S0TBVBQNhgDO+eSN7thZzLfLY=; b=RsWfnuQ1/fCr+Qkc0MS+TxnMApdfoAFgqkaH2M0bTU5nS4Ivln4bNvjrwQJL7y6bYARX5n BAbDER7DVUjpq/btqj5pFBzyvb+NrQSyrjEHEYfijMBLPsK5+RtZFSlckHkrbGCS+ao8bQ IN/vIPlHknKOlOX05hdXtKwzutFBlQc= X-MC-Unique: pL7hoiZ2Py2oK9pg5KdCKw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 035/147] contrib/elf2dmp: convert to meson Date: Mon, 10 Aug 2020 19:07:13 +0200 Message-Id: <1597079345-42801-36-git-send-email-pbonzini@redhat.com> In-Reply-To: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> References: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:31:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 4 ---- Makefile.objs | 6 ------ configure | 3 --- contrib/elf2dmp/Makefile.objs | 4 ---- contrib/elf2dmp/meson.build | 5 +++++ meson.build | 6 ++++++ 6 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 contrib/elf2dmp/Makefile.objs create mode 100644 contrib/elf2dmp/meson.build diff --git a/Makefile b/Makefile index 58ec90d..574435e 100644 --- a/Makefile +++ b/Makefile @@ -286,7 +286,6 @@ dummy :=3D $(call unnest-vars,, \ authz-obj-y \ chardev-obj-y \ qga-obj-y \ - elf2dmp-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ @@ -496,9 +495,6 @@ ifneq ($(EXESUF),) qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) endif =20 -elf2dmp$(EXESUF): $(elf2dmp-obj-y) - $(call LINK, $^) - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ diff --git a/Makefile.objs b/Makefile.objs index 336a684..1486254 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -100,9 +100,3 @@ version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o # extracted into a QAPI schema module, or perhaps a separate schema. qga-obj-y =3D qga/ qga-vss-dll-obj-y =3D qga/ - -###################################################################### -# contrib -elf2dmp-obj-y =3D contrib/elf2dmp/ - -###################################################################### diff --git a/configure b/configure index 6f7a5aa..98c413f 100755 --- a/configure +++ b/configure @@ -6652,9 +6652,6 @@ if test "$want_tools" =3D "yes" ; then if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then tools=3D"qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools" fi - if [ "$curl" =3D "yes" ]; then - tools=3D"elf2dmp\$(EXESUF) $tools" - fi fi if test "$softmmu" =3D yes ; then if test "$linux" =3D yes; then diff --git a/contrib/elf2dmp/Makefile.objs b/contrib/elf2dmp/Makefile.objs deleted file mode 100644 index 1505716..0000000 --- a/contrib/elf2dmp/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -elf2dmp-obj-y =3D main.o addrspace.o download.o pdb.o qemu_elf.o - -download.o-cflags :=3D $(CURL_CFLAGS) -download.o-libs :=3D $(CURL_LIBS) diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build new file mode 100644 index 0000000..b3de173 --- /dev/null +++ b/contrib/elf2dmp/meson.build @@ -0,0 +1,5 @@ +if 'CONFIG_CURL' in config_host + executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.= c', 'qemu_elf.c'), + dependencies: [glib, curl], + install: true) +endif diff --git a/meson.build b/meson.build index dc970df..ed557f1 100644 --- a/meson.build +++ b/meson.build @@ -106,6 +106,11 @@ if 'CONFIG_VIRGL' in config_host virgl =3D declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].s= plit(), link_args: config_host['VIRGL_LIBS'].split()) endif +curl =3D not_found +if 'CONFIG_CURL' in config_host + curl =3D declare_dependency(compile_args: config_host['CURL_CFLAGS'].spl= it(), + link_args: config_host['CURL_LIBS'].split()) +endif =20 target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false @@ -270,6 +275,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, =20 if have_tools subdir('contrib/rdmacm-mux') + subdir('contrib/elf2dmp') =20 if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') --=20 1.8.3.1