From nobody Tue Feb 10 08:31:34 2026 Delivered-To: importer@patchew.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=1611560309; cv=none; d=zohomail.com; s=zohoarc; b=eLwaBkERNTOAE+O4Q9MyFkdumj+BZFdbaf0uuEGEqt/tVS04KegLctEUKN109W2vCaSS5MJgWf59IarEQH7A0+bLz2a3+OxOxch/8TplrVYairwPIUTt0v0LetaDmdo42BYNu3ZM//MQqH4Mq5QvLPXS3AOn2hiEiy7VQqC1hY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611560309; 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=wboWuw3/pGvT+G+sp6KToMGli2Cop28MQotDr8HhZN8=; b=ZL6UPdY/5gPMH0OuqsbciJmJh1nYYE5WvlnnCBO4sXNuix5MpOHtQFVo0NN9WnMwcpygPK+/M9Qo+jB0I+WREVQRi5mkniFfGnLuZFvGkpoX5g/J3ikIb9hNGQR6xTGkqNLI6Mus9PxqBwObKGznwA2QJPNPFC8qIlS6L/4r4kA= 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 1611560309794196.70364662782265; Sun, 24 Jan 2021 23:38:29 -0800 (PST) Received: from localhost ([::1]:57026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3wSB-0001T4-Qi for importer@patchew.org; Mon, 25 Jan 2021 02:38:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3wP3-0007XS-Dk for qemu-devel@nongnu.org; Mon, 25 Jan 2021 02:35:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58787) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l3wOr-0001qz-Ch for qemu-devel@nongnu.org; Mon, 25 Jan 2021 02:35:09 -0500 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-84-gB9wxXrUPOiBQtpQT0w6UQ-1; Mon, 25 Jan 2021 02:34:52 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9AC4A59; Mon, 25 Jan 2021 07:34:51 +0000 (UTC) Received: from localhost (unknown [10.36.110.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5F9D10013BD; Mon, 25 Jan 2021 07:34:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611560096; 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=wboWuw3/pGvT+G+sp6KToMGli2Cop28MQotDr8HhZN8=; b=h2mkPd/COzLUNRiweYtFmnpQSepOQmTTTN8jFxNL870PyAyp3lfGLs+xAB8yXFqlCJcRGw mCxh0WsAPjJVRhMifmuxV3IY4uK9WcNa68Imd/2izzrGkJSG0LMDvRXhjXAwqI0ciImXip SLFGx0bwsVIMYly0W3WQFQDqEsHhEhw= X-MC-Unique: gB9wxXrUPOiBQtpQT0w6UQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] build-sys: make libslirp a meson subproject Date: Mon, 25 Jan 2021 11:34:27 +0400 Message-Id: <20210125073427.3970606-3-marcandre.lureau@redhat.com> In-Reply-To: <20210125073427.3970606-1-marcandre.lureau@redhat.com> References: <20210125073427.3970606-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@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=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: samuel.thibault@ens-lyon.org, j@getutm.app, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Remove the manual build. Signed-off-by: Marc-Andr=C3=A9 Lureau Tested-by: Joelle van Dyne --- configure | 2 +- meson.build | 62 +++-------------------------------- .gitmodules | 4 +-- slirp =3D> subprojects/libslirp | 0 4 files changed, 7 insertions(+), 61 deletions(-) rename slirp =3D> subprojects/libslirp (100%) diff --git a/configure b/configure index dcc5ea7d63..6c98552452 100755 --- a/configure +++ b/configure @@ -5206,7 +5206,7 @@ case "$slirp" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. if test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then - git_submodules=3D"${git_submodules} slirp" + git_submodules=3D"${git_submodules} subprojects/libslirp" fi ;; esac diff --git a/meson.build b/meson.build index 35a9eddf5c..95ef1c8adf 100644 --- a/meson.build +++ b/meson.build @@ -1472,7 +1472,7 @@ slirp_opt =3D 'disabled' if have_system slirp_opt =3D get_option('slirp') if slirp_opt in ['enabled', 'auto', 'system'] - have_internal =3D fs.exists(meson.current_source_dir() / 'slirp/meson.= build') + have_internal =3D fs.exists(meson.current_source_dir() / 'subprojects/= libslirp/meson.build') slirp =3D dependency('slirp', static: enable_static, method: 'pkg-config', required: slirp_opt =3D=3D 'system' or @@ -1486,63 +1486,9 @@ if have_system endif endif if slirp_opt =3D=3D 'internal' - slirp_deps =3D [] - if targetos =3D=3D 'windows' - slirp_deps =3D cc.find_library('iphlpapi') - endif - slirp_conf =3D configuration_data() - slirp_conf.set('SLIRP_MAJOR_VERSION', meson.project_version().split('.= ')[0]) - slirp_conf.set('SLIRP_MINOR_VERSION', meson.project_version().split('.= ')[1]) - slirp_conf.set('SLIRP_MICRO_VERSION', meson.project_version().split('.= ')[2]) - slirp_conf.set_quoted('SLIRP_VERSION_STRING', meson.project_version()) - slirp_cargs =3D ['-DG_LOG_DOMAIN=3D"Slirp"'] - slirp_files =3D [ - 'slirp/src/arp_table.c', - 'slirp/src/bootp.c', - 'slirp/src/cksum.c', - 'slirp/src/dhcpv6.c', - 'slirp/src/dnssearch.c', - 'slirp/src/if.c', - 'slirp/src/ip6_icmp.c', - 'slirp/src/ip6_input.c', - 'slirp/src/ip6_output.c', - 'slirp/src/ip_icmp.c', - 'slirp/src/ip_input.c', - 'slirp/src/ip_output.c', - 'slirp/src/mbuf.c', - 'slirp/src/misc.c', - 'slirp/src/ncsi.c', - 'slirp/src/ndp_table.c', - 'slirp/src/sbuf.c', - 'slirp/src/slirp.c', - 'slirp/src/socket.c', - 'slirp/src/state.c', - 'slirp/src/stream.c', - 'slirp/src/tcp_input.c', - 'slirp/src/tcp_output.c', - 'slirp/src/tcp_subr.c', - 'slirp/src/tcp_timer.c', - 'slirp/src/tftp.c', - 'slirp/src/udp.c', - 'slirp/src/udp6.c', - 'slirp/src/util.c', - 'slirp/src/version.c', - 'slirp/src/vmstate.c', - ] - - configure_file( - input : 'slirp/src/libslirp-version.h.in', - output : 'libslirp-version.h', - configuration: slirp_conf) - - slirp_inc =3D include_directories('slirp', 'slirp/src') - libslirp =3D static_library('slirp', - sources: slirp_files, - c_args: slirp_cargs, - include_directories: slirp_inc) - slirp =3D declare_dependency(link_with: libslirp, - dependencies: slirp_deps, - include_directories: slirp_inc) + libslirp =3D subproject('libslirp', + default_options: ['default_library=3Dstatic']) + slirp =3D libslirp.get_variable('libslirp_dep') endif endif =20 diff --git a/.gitmodules b/.gitmodules index 2bdeeacef8..0fb15efacd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,8 +49,8 @@ [submodule "roms/edk2"] path =3D roms/edk2 url =3D https://git.qemu.org/git/edk2.git -[submodule "slirp"] - path =3D slirp +[submodule "subprojects/libslirp"] + path =3D subprojects/libslirp url =3D https://git.qemu.org/git/libslirp.git [submodule "roms/opensbi"] path =3D roms/opensbi diff --git a/slirp b/subprojects/libslirp similarity index 100% rename from slirp rename to subprojects/libslirp --=20 2.29.0