From patchwork Tue Oct 12 16:25:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515663 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp5618824ime; Tue, 12 Oct 2021 09:46:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaP6K3fhxJNysQu4F3NBV4Usb6lelsQcKkZr33D9KcxzDvwkvPK3ZC+s5BlF3nGpoQ7sGa X-Received: by 2002:a05:6214:628:: with SMTP id a8mr19287341qvx.21.1634057181798; Tue, 12 Oct 2021 09:46:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634057181; cv=none; d=google.com; s=arc-20160816; b=m5JE5vNJsuc0IomyBRDewiBk9BgGltpAsd4M84n/TOp+rwKNei2YOTqW2gJFh4+E/6 /LC5OLv2vax+iwQFSq8W4FQgITQ1DjyDGcog8Fh0WZYVC/iifU0WQJRaNe1MM0gInbpL VRtGoPWztxICYtXDAdxHHzfqBXlLtd6HOC8EhO4TPNKce0N9IZfLxwnHUv8XwkSBV0Db UdoOJN6gkyqpQbLjdnUyPmlnR2mj78aVRM/izpWfNnXDZAAC0dBkez8FXcsFgfeggtb0 kPeoOjNRJ7O34w9SRkPxGy8N3yVGqv6mHlIReJTWVpa7DKd0Q8W5WkIzJ79hk+5+fBXx hmRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=Xg4Oky05y1+VSmoVzrKShYUh/WjP+0Z/IvaHAjn2j2I=; b=jMtDnUXXiC//k1eqApT2ENSCXGMUOHJ4vQizXUQFzPFH2ix6HUTEdwCUd+hiyBEncD VdF+yenUeEm7KK7YUnvOVhnQbcCFjhrxAaHhwT1YUgvS02ocUI85evW4n55+bZtJtqLj 8ocD+mAFTv+Ew+ZettNGv64f8H/K5Gvek7t0VFJ8PCzLn07+XgoIGW6nqnsJVFuO/Ysd I8zniTJrH8iC/qOgxLisA9Y+VMvUBGDjYjsjuFiYoty3sCZETkgsfwQj6w+caxpPgY5v Z+lon/3UABsHaYqs9Q4HWJ5wYrVZlMPB7ErWq1PkiKhPMZV45hImyBxt5g8wLAfKhqWw 8G+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P6saEEJc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i9si2008357qko.220.2021.10.12.09.46.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Oct 2021 09:46:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P6saEEJc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1maKuz-0002qS-5S for patch@linaro.org; Tue, 12 Oct 2021 12:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maKbM-0005h9-AD for qemu-devel@nongnu.org; Tue, 12 Oct 2021 12:26:04 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1maKbJ-0007do-Rj for qemu-devel@nongnu.org; Tue, 12 Oct 2021 12:26:04 -0400 Received: by mail-wr1-x42f.google.com with SMTP id r10so68657049wra.12 for ; Tue, 12 Oct 2021 09:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Xg4Oky05y1+VSmoVzrKShYUh/WjP+0Z/IvaHAjn2j2I=; b=P6saEEJcHe7Yvw2zhaW0d1Dts/MEUZz3nyYiu2JlN8ui5ydLEEqMq7UVnND0U5UEtT LdC3zo8VYn2durKnIxXXdTkk1IOzFUmAigry8t2ocNu5PSGqqFkAf1nqHuFiV5blHwRR XMLUw9ZlwHgj4DvBTKsJoOPiWi/3GPbze+2JNFlkj4VPdUOPtGngCIdBgRbJhCcqOwcP hosJ689a7TUv+Cyx8mVV9fqsBKdMhZcY/M7Yw7aE/OW4+AGcRGp0yA05iYHg5AOvBZ76 vRHgF6hs8knyiUvO+K/GGl8817fypTHlQvv3lsVm2ZsLT/mIY1KQ41sqzxR+bdSzcR/L VSWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Xg4Oky05y1+VSmoVzrKShYUh/WjP+0Z/IvaHAjn2j2I=; b=DrMFRKbIcOV1gbvDrwsmb1bgs2R3Uf/qvzUQvqXkoRR+1bkkwKIZBVLkJvwbMtwC6O Irzfnfnjkr6U5FIgry26/W8sjCb5SjqlwqHWrak6WX/6LqY+6laHOWlKvJD71CEQ+IzE PJmKxEVGuX4QPK5DgVRxDb9iKZAbS4WYONHy9qdPojZUpJxKClFGeWJIYAZ7xLFmdkCb QHCkWM97+Et62ew/2PU015QAvqW+mr+BOUuRI7blGKg350fnd80zWeUa/Q7+navy6CEZ l4mz9zvc5UC6hoPQljy/wXxEC+QsQ0Ovx4RBCSN5KQE45VNc1OG+eM/hQVQEmSEFNcRe rEcQ== X-Gm-Message-State: AOAM531UIE5/92Yw0Hmdm7zzUhDRcon038sq7mMNYMidBS1DDJrV1NgH vFV5InAmK1Gk7eNSsdxpx16P6w== X-Received: by 2002:a05:600c:3546:: with SMTP id i6mr6861648wmq.146.1634055959851; Tue, 12 Oct 2021 09:25:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p11sm3295708wmi.0.2021.10.12.09.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 09:25:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 27D701FF96; Tue, 12 Oct 2021 17:25:58 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2] meson.build: don't include libbpf in the common source set Date: Tue, 12 Oct 2021 17:25:52 +0100 Message-Id: <20211012162552.16865-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This library is only needed for the softmmu targets and as such break static *-user builds where libbpf is detected and it tries to link it into the user binaries. In fact ebpf/meson.build already brings libbpf into the softmmu build so we can delete the common_ss line altogether. Fixes: 46627f41b6 ("ebpf: Added eBPF RSS loader.") Signed-off-by: Alex Bennée Message-Id: <20211005182443.2954499-1-alex.bennee@linaro.org> -- v2 - delete common_ss altogether instead of replacing with softmmu_ss --- meson.build | 2 -- 1 file changed, 2 deletions(-) -- 2.30.2 diff --git a/meson.build b/meson.build index 99a0a3e689..42b7ba360d 100644 --- a/meson.build +++ b/meson.build @@ -2301,8 +2301,6 @@ subdir('bsd-user') subdir('linux-user') subdir('ebpf') -common_ss.add(libbpf) - bsd_user_ss.add(files('gdbstub.c')) specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)