From nobody Tue Feb 10 13:16:21 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=1612192616; cv=none; d=zohomail.com; s=zohoarc; b=PC0R4K6PFtNYcWzRzyXEPX44zVXNwbAv98HTWABO7jTCVIn5AcaLI5+3NiR0Ey1Qlnt/DumTwK9/fSztZtKmk5HCGYwv003Or+uwW7JxjBD2VhIfkxhKRxzpbqdoshQm68P4saqPdd7swbZA6r3Wm2uflSmiOfHj934q6HkpAoo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612192616; 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=mdT0+fKTMXuenspMXyJDwjQyNT4t8VurzgFoCd0t82M=; b=L6sUKGIVWYfLTK2uIbcMqQ7ZkfRIKdmxKklqTUQDInipJzDwT0w6/wEJq9SsokUxtLPy+jY+/VX4dE1do6koEt5+mpWKpwZYdUy23KgYHgSxwmZeX8catlYU9qUOjECsTYO4VcCbjQI9Apmcdp/REU+1Ef0p6XOciabWQheJjRg= 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 1612192615757557.4264789345327; Mon, 1 Feb 2021 07:16:55 -0800 (PST) Received: from localhost ([::1]:60392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6alu-0007kg-8G for importer@patchew.org; Mon, 01 Feb 2021 10:05:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6agw-0002yZ-41 for qemu-devel@nongnu.org; Mon, 01 Feb 2021 10:00:39 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:36847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6agn-0002fw-6O for qemu-devel@nongnu.org; Mon, 01 Feb 2021 10:00:31 -0500 Received: by mail-wm1-x32b.google.com with SMTP id i9so13469949wmq.1 for ; Mon, 01 Feb 2021 07:00:25 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id q6sm25879813wrw.43.2021.02.01.07.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 07:00:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mdT0+fKTMXuenspMXyJDwjQyNT4t8VurzgFoCd0t82M=; b=X93opkl/+gIJI2123kKgbN7GLPeajmNMIOV1/qm/rpZuphlKVplqvkUCTxnaamXTN9 rNSTitrhyMVbuFLxD8h/zo9rFadGqtcWbfr+EHgXKVVuwB3+8wkZBjA2DoJzAKYOe+0s zCx8185NNPjrgneOCnaNc/jOjKdBfRwQnrdPD5J2Osp3kLbG6McnF2YmCMqiCxtKi/4P WmoVvS/Y3UGYAFpBpeY9u8lDtpCt3JeI268VKUULNILVAZM/b+fknmoPySXSoSsk0yup fR/a2xZDnwEr6y60oPiDTTl4AhvWb3oTtQNH149KbyYCoaKF1n/wrlHYNKzuObsd7mu4 3cvw== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mdT0+fKTMXuenspMXyJDwjQyNT4t8VurzgFoCd0t82M=; b=ShYQWGgCzo4vUEwwi6WxATCfI3C3MYSIDBOCXhocD0yPEy+EpE0xr56uCEslU30azX WlWeiTLY7bjUsrrh0idtlfgOOFmXvxXeBqsNXIOweg5CTRbgCEbHZhQ6557x5flcQX5N +RHSnQbNWGHjyIoAICgO9+cdHBd5KxsID06PrYGkuz3HBXRMIdNjADUxURWXj5j+j0b6 uSXz+tWEo2CtjNy5Sek7e6mesT0bmMcRwfTnrEKPSK1FD/HBMbHN8feV0kB3gk4wHr+Y j6tiU3Xr4nCvzpCmTosip2TAR1m6Vwx0wdv7STeMf1Z1Mqan9y3h+HJzm02sSM5KXfif 4U6w== X-Gm-Message-State: AOAM531a4hXxWKbyocGaKp122dGb8VwDJz7NCtt/YomDcJ6LOKPtp4P1 YDDBUYxS3FONofFP9U/1mlov5IkYO/+BpQ== X-Google-Smtp-Source: ABdhPJz3Wyr8LD0NiyVzLkWKv29c7uDPEUHW6op0BUt+dXIEd/uKvxZAojYnvfxopYKdAnkZwacjSQ== X-Received: by 2002:a1c:7f94:: with SMTP id a142mr15173920wmd.145.1612191624663; Mon, 01 Feb 2021 07:00:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/38] build-sys: make libslirp a meson subproject Date: Mon, 1 Feb 2021 16:00:19 +0100 Message-Id: <20210201150021.53398-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210201150021.53398-1-pbonzini@redhat.com> References: <20210201150021.53398-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Remove the manual build. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20210125073427.3970606-3-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- .gitmodules | 4 +-- configure | 2 +- meson.build | 63 +++-------------------------------- slirp =3D> subprojects/libslirp | 0 4 files changed, 7 insertions(+), 62 deletions(-) rename slirp =3D> subprojects/libslirp (100%) 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/configure b/configure index 21369efc63..337283571a 100755 --- a/configure +++ b/configure @@ -5212,7 +5212,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 b6c9db613b..4e694e78a0 100644 --- a/meson.build +++ b/meson.build @@ -1489,7 +1489,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', kwargs: static_kwargs, method: 'pkg-config', required: slirp_opt =3D=3D 'system' or @@ -1503,64 +1503,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', - build_by_default: false, - 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/slirp b/subprojects/libslirp similarity index 100% rename from slirp rename to subprojects/libslirp --=20 2.29.2