From nobody Thu Apr 25 21:42:37 2024 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1685049734; cv=none; d=zohomail.com; s=zohoarc; b=gmSnR+G7YWKrHwhY+jhajNMPJD3McEWj44eaQ/jXV2PeEOQk08MrVs8vG733LMeHuwoKrbpkHw6IdC8KxGK3avKL1zJu+ymCyx3yF1/k1edUQRGBFQzRn2A1zQguF2vYB1s3kfxP0EkopAWUXEl7zqwLoOYg1/VHVmXQavdlgvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685049734; h=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=2iRwSuEcxRdCDJUgTwUbDOrXAWdGURsmoQxRwS9ji3o=; b=R4R61Dx6c/Nl74xX2JuSNjO0iiGGJCDg3Z6TW7+M1sW3ydPTiyKmBQ/eVmgp3hfGxp3tDOe+UHyWLDw3GRk0XrnRAP58LOMhMImwZoR669vZyu3HsoFMpsw3+uPe8njNPnR+K2BaDMeFIimcYvRfV/Yo28EYB+k1agAwbh/1h7s= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1685049734761826.7795764581151; Thu, 25 May 2023 14:22:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2IOZ-00019A-As; Thu, 25 May 2023 17:21:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2IOL-00017Q-9Y for qemu-devel@nongnu.org; Thu, 25 May 2023 17:21:01 -0400 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2IOI-0001kM-5C for qemu-devel@nongnu.org; Thu, 25 May 2023 17:21:00 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6902B21972; Thu, 25 May 2023 21:20:50 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A18DC134B2; Thu, 25 May 2023 21:20:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eG/aGjDRb2SNKgAAMHmgww (envelope-from ); Thu, 25 May 2023 21:20:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1685049650; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2iRwSuEcxRdCDJUgTwUbDOrXAWdGURsmoQxRwS9ji3o=; b=QBY5AQqalfD2dPBFRnnGRJ4CqO/U1+5PhV3duKaPSkelID6L0rJHiz/lkejCbuGIp4e2Ex dmB3Q05+OKPjGh7kAMspEZOdlx0cGjJjVM0RKx1li4PuEsR2tUNTo3jBLWxRefJP/9o23N o0BFkp28OizDXPm9ZWX870c2LJIGwoQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1685049650; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2iRwSuEcxRdCDJUgTwUbDOrXAWdGURsmoQxRwS9ji3o=; b=t4wKsluViYNOxngQVORKTecLpn8DchjJ6UiQvUODHTSBiPQO5xoRTfxfea8o1FSFET06Lq FfdIL7YqDwGel3Cw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] meson: Remove leftover comment Date: Thu, 25 May 2023 18:20:43 -0300 Message-Id: <20230525212044.30222-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230525212044.30222-1-farosas@suse.de> References: <20230525212044.30222-1-farosas@suse.de> 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=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1685049735318100003 Content-Type: text/plain; charset="utf-8" Commit d2e6f9272d ("fuzz: remove fork-fuzzing scaffolding") removed the linker script and forgot to remove the comment. Signed-off-by: Fabiano Rosas --- meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/meson.build b/meson.build index ef181ff2df..ba1b7012cd 100644 --- a/meson.build +++ b/meson.build @@ -395,8 +395,6 @@ if targetos !=3D 'sunos' and not get_option('tsan') qemu_ldflags +=3D cc.get_supported_link_arguments('-Wl,--warn-common') endif =20 -# Specify linker-script with add_project_link_arguments so that it is not = placed -# within a linker --start-group/--end-group pair if get_option('fuzzing') # Specify a filter to only instrument code that is directly related to # virtual-devices. --=20 2.35.3 From nobody Thu Apr 25 21:42:37 2024 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1685049718; cv=none; d=zohomail.com; s=zohoarc; b=YtmNZhwo9jKs2i3xdl1mNL8Urovz/mMp7GE/9wUoyY7fs46Zwy3sOy/b7BnZnON8OheApsdQlLwA41/egpcq+38fwlfR3qJNXLoqkkVtxEVegA+HEcQTJG1VPeMilJV9noUZK7IQkV3mCBB1NKvLGSTErkkFqujvL0rAS7ej4SU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685049718; h=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=YshmVS/nJh7Yg3ikVyObqrwt1xPQ6peGpZpry3DnKmM=; b=QG3UtWD/bQMeFGY8CdEI21pyvvj3M3RUc+3aZDW0Gz6Cnzthtf8HbGGYx1XiIFCB5e3+wFN3kSMwzyNB/aWugOkt81iOgbMeRDM+Bkh0sm0YxWWoVWlC7j5ay6a4PVZIlc6Nxr64QYESGyn9K4U2hi3xE7iZirdzSDbN8LPjYhY= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1685049718269257.5998845695368; Thu, 25 May 2023 14:21:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2IOR-000186-8p; Thu, 25 May 2023 17:21:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2IOJ-00017J-Ns for qemu-devel@nongnu.org; Thu, 25 May 2023 17:21:00 -0400 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2IOI-0001lC-3P for qemu-devel@nongnu.org; Thu, 25 May 2023 17:20:59 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6A9A621C31; Thu, 25 May 2023 21:20:52 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D48DC134B2; Thu, 25 May 2023 21:20:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QDcMJzLRb2SNKgAAMHmgww (envelope-from ); Thu, 25 May 2023 21:20:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1685049652; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YshmVS/nJh7Yg3ikVyObqrwt1xPQ6peGpZpry3DnKmM=; b=SlXhE0pYbsymlw2wvY/Sa0WGYKYDIJXVZtXElhDbntfhWx4AqAKNWZ0Ix0MQfn6I7/dr23 EzvzYW0wPqHqK816vNczSKqiS4gMzqlrj/hkAazIA2H9zIXhBoK0+hNBYEIJjhukq6ocH1 Pkf26XRJLGf3d3VF7nDCeJEnEXhjUzg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1685049652; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YshmVS/nJh7Yg3ikVyObqrwt1xPQ6peGpZpry3DnKmM=; b=qxbcrX7szKYTnULzpziodfuyQ4LC4txoK1ANs0MrdaAByW2l1QWU8oFFA6HIFlWIvtae3h pi+WoRe+CSoRgbDQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH 2/2] meson: Add static glib dependency for initrd-stress.img Date: Thu, 25 May 2023 18:20:44 -0300 Message-Id: <20230525212044.30222-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230525212044.30222-1-farosas@suse.de> References: <20230525212044.30222-1-farosas@suse.de> 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=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1685049719587100001 Content-Type: text/plain; charset="utf-8" We recently moved glib detection code to meson but the static libs were left out. Add a specific dependency for stress.c which is linked statically. $ make V=3D1 tests/migration/initrd-stress.img before: cc -m64 -mcx16 -o tests/migration/stress ... -static -Wl,--start-group /usr/lib64/libglib-2.0.so -Wl,--end-group ... bin/ld: attempted static link of dynamic object `/usr/lib64/libglib-2.0.so' after: cc -m64 -mcx16 -o tests/migration/stress ... -static -pthread -Wl,--start-group -lm /usr/lib64/libpcre.a -lglib-2.0 -Wl,--end-group Fixes: fc9a809e0d ("build: move glib detection and workarounds to meson") Signed-off-by: Fabiano Rosas Reviewed-by: Juan Quintela Tested-by: Juan Quintela --- tests/migration/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/migration/meson.build b/tests/migration/meson.build index dd562355a1..ac71f13290 100644 --- a/tests/migration/meson.build +++ b/tests/migration/meson.build @@ -1,9 +1,11 @@ sysprof =3D dependency('sysprof-capture-4', required: false) +glib_static =3D dependency('glib-2.0', version: glib_req_ver, required: fa= lse, + method: 'pkg-config', static: true) =20 stress =3D executable( 'stress', files('stress.c'), - dependencies: [glib, sysprof], + dependencies: [glib_static, sysprof], link_args: ['-static'], build_by_default: false, ) --=20 2.35.3