From patchwork Mon Nov 20 15:08:23 2023 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: 745362 Delivered-To: patch@linaro.org Received: by 2002:a5d:5052:0:b0:32d:baff:b0ca with SMTP id h18csp1343720wrt; Mon, 20 Nov 2023 07:09:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IGh6gEdBOaYiPeaad6/tu3yfcOiAUgIvrzv4PzP+2uco/mdBI+G8RWxP+IX1l1Wzk5Nxr+I X-Received: by 2002:a81:72c6:0:b0:5ad:d6b5:822a with SMTP id n189-20020a8172c6000000b005add6b5822amr8472162ywc.21.1700492995901; Mon, 20 Nov 2023 07:09:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700492995; cv=none; d=google.com; s=arc-20160816; b=erxC0dZSdlklI4wi6aQ58Fyfrh5NwMqi5IWdbLz5QRJYwPYToizxmeRO1n+/2fiCAd VbwlH1pu/KxyJwXyIrSUWEbRLPwscQxBggFWgwLHQaArpQua5aHuOmPB6qo6ERv7b5j6 F/hIRO20bZjTmbaWsBDdHU6H+cJPmTN/0mw36seFmGjwPMp0W9xIbN2C4aYB4f4GV526 i79nwyeX40AdhD0NNnJmT5PMtAidOf21pd96OCijDjt/VXmBMf0SsJO9mb+zA6RBKAiJ az2JlTdFjwe8ADJmJvOTWeJ4QKV+zvscfmG3lXNqbde68TvmzuTtEki1bSfAj5ph3Vkj w11g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=r13y4mFZjL5YxuFf8Jb2e5kHdn8MHdL63WduZWtvH6Q=; fh=/2zIotGbV2Q5iRh1tbASdYDRQwqa6mvvDUhxPVzDdrA=; b=Sx/QuCuT8Oh1VnMjGkY67QA/mDI1Ck4nAdUkH1lyimVLiK+QtDY7SNQOIWoeGDqsBJ lOqRlCaIkxHET7u5r5ZWQ21uBH6iEEHsU5OIzEXQi6K6DoLjZT2d0Hvf+RHqVWQgnMAH f6To2R+vVuqLg1Drwzxtd4rOV8xO9KCwTcUwd0QrKVi4whLJVVWeBmaY+b3FRZvpdZP7 JF6iPv6tWZ9lzJOAUwVJgM4BMv9AUthar0szEjiwDkU4CE1MDfs3tDJguy0q0lUpbXnf 9Jst8m/nZacblUIiNh68evemDsi5zuucMsE2w67W4YmfUzK9ectKt4/PcmpgMUOWT86s Vufw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OPtCdTTK; 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 s130-20020a819b88000000b005c5bc428e3asi4596453ywg.19.2023.11.20.07.09.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Nov 2023 07:09:55 -0800 (PST) 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=OPtCdTTK; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55ta-0006AD-OS; Mon, 20 Nov 2023 10:09:06 -0500 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 1r55tA-0005jw-Kj for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:41 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55t7-0001Bf-16 for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:40 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4079ed65471so18230205e9.1 for ; Mon, 20 Nov 2023 07:08:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492915; x=1701097715; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r13y4mFZjL5YxuFf8Jb2e5kHdn8MHdL63WduZWtvH6Q=; b=OPtCdTTKWyWfsRvlja6HGNwngJ4ZBUYjHSWwixKZ25VYwPMTp8PA+jINIjg0eISMvj kwdsQikTN2gkV/YLikYmmd5oq88idkg98kSRaM/qWCQMkOnAbrpNQLUAuCWeQHlZ0F09 YtF7pmO6H5Ri1K0+1pNPqAGakEsVCITdBRtyECyRRy9mMzzxaS1HWnGCwNxROK79cOHo 72La/K+o+CzTJ3E4a9bx7qTZv439hDHzrdXKz0wgORLHMvY+dGpPFZeyRTM+5zumNWxz kDaWcOfVxgrj7IqK9sqmmG+iRTz+f2mkNgjFSmb6OnCFeuAOjZaM/GOLtonoTjBjRnc3 V81A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492915; x=1701097715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r13y4mFZjL5YxuFf8Jb2e5kHdn8MHdL63WduZWtvH6Q=; b=sMcpp3bUh+D9plOT6hTYLW8r2cB3ddOUQU9e5O766zqhNUSxvcRzZCjNi7w4HmNjBb nlsKLz4rWqT0PWbDddrAxX5Q87zrJTZaayZu7vkLlkLaRRoxa7yxuc2rOX3aGmgC1W4G JVm3n9T3uEC0HODgtkubdfb5XouoMbpKg9cI/op/zdxCqtf2s7ucg99h+1AegfKeY+7z /vOU3qzRKOaZt+ZZ7OezSAarZ2F935cQdKQ0FLLfzQiCArRrCT63IgOVzHycZLfG9awb vzScqZw/6S8/EClNtBeMf8JYLrPNZFunoaz7gnfKAVlZhd79gA43c2ZWXp6XISyfCK70 ueLg== X-Gm-Message-State: AOJu0YwKCNCuRxTskWygaMiuqZ7hVVL5qVNJFVzOYIAvT4Banrq2bFwc nKHbLcEgne6FTdbBNroZTKov/w== X-Received: by 2002:a05:600c:450a:b0:408:2b:3ae with SMTP id t10-20020a05600c450a00b00408002b03aemr5446408wmo.6.1700492915281; Mon, 20 Nov 2023 07:08:35 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 1-20020a05600c230100b003fefb94ccc9sm13477072wmo.11.2023.11.20.07.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6132B65758; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?C=C3=A9dric?= =?utf-8?q?_Le_Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin , Greg Manning Subject: [PATCH v2 04/14] plugins: fix win plugin tests on cross compile Date: Mon, 20 Nov 2023 15:08:23 +0000 Message-Id: <20231120150833.2552739-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Greg Manning Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1972 Cross compile gcc is more picky about argument order than msys. Changed the meson command to take the (now renamed) libqemu_plugin_api.a as a lib, rather than an object. This puts it in the right place on both native and cross compile gcc commands Reenable plugins on crossbuilds Signed-off-by: Greg Manning Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20231109124326.21106-2-gmanning@rapitasystems.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/crossbuilds.yml | 2 +- contrib/plugins/Makefile | 2 +- plugins/meson.build | 2 +- tests/plugin/meson.build | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index c2af6c7f44..d19d98cde0 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -165,7 +165,7 @@ cross-win32-system: job: win32-fedora-cross-container variables: IMAGE: fedora-win32-cross - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal --disable-plugins + EXTRA_CONFIGURE_OPTS: --enable-fdt=internal CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu microblazeel-softmmu mips64el-softmmu nios2-softmmu artifacts: diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 1783750cf6..0b64d2c1e3 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -49,7 +49,7 @@ all: $(SONAMES) $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $< ifeq ($(CONFIG_WIN32),y) -lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/qemu_plugin_api.lib +lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/libqemu_plugin_api.a $(CC) -shared -o $@ $^ $(LDLIBS) else ifeq ($(CONFIG_DARWIN),y) lib%$(SO_SUFFIX): %.o diff --git a/plugins/meson.build b/plugins/meson.build index 40d24529c0..6b2d7a9292 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -28,7 +28,7 @@ if get_option('plugins') # then use dlltool to assemble a delaylib. win32_qemu_plugin_api_lib = configure_file( input: win32_plugin_def, - output: 'qemu_plugin_api.lib', + output: 'libqemu_plugin_api.a', command: [dlltool, '--input-def', '@INPUT@', '--output-delaylib', '@OUTPUT@', '--dllname', 'qemu.exe'] ) diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build index 528bb9d86c..28a929dbcc 100644 --- a/tests/plugin/meson.build +++ b/tests/plugin/meson.build @@ -4,7 +4,8 @@ if get_option('plugins') if targetos == 'windows' t += shared_module(i, files(i + '.c') + '../../contrib/plugins/win32_linker.c', include_directories: '../../include/qemu', - objects: [win32_qemu_plugin_api_lib], + link_depends: [win32_qemu_plugin_api_lib], + link_args: ['-Lplugins', '-lqemu_plugin_api'], dependencies: glib) else