From patchwork Wed Nov 15 20:55:36 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: 743997 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp2966897wrw; Wed, 15 Nov 2023 12:58:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IH4yN7xGBl1mZGP+xLHowcAcJoW56BTXgjU6a8UnnzVtern/TGbwwcB7GuIluQfUaYyy4DK X-Received: by 2002:a05:622a:178a:b0:40f:dfbc:2405 with SMTP id s10-20020a05622a178a00b0040fdfbc2405mr10753422qtk.27.1700081920287; Wed, 15 Nov 2023 12:58:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700081920; cv=none; d=google.com; s=arc-20160816; b=Xp4cirIl6sT15lM5ZElyWTKa45+73eAjFKDBn301BCWmGIOB1FlQz0ajDAwnNBtOIe YJTYDVKh1EUHZSQz2tOMi92E9Ji24L47R96VYomPy88mkv7J9TwTLkZu7v1Vl3aV27ee 9w9mZZ7OtB0COTLMjydKyMEbcmXibrAjvu2NciuHl/qkpR0E6DsluXZpA8BoHscZK6Ej v1l1JRdOaAZoLEysy3GWzzqCKvmO53Hoa3FQk12pm3RbOJAsFqNFI6YEEAp1d5WOzP3K TUo2sIZMfDZKTyrc0sPh3VJ20XVwXCLmp+J9DTckIPq6EGPGvij71kAjQQzzmo59GmXm DFvQ== 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=dzVXx5hD9uLMfMYZqpYCvOR8Fr2s+NIZUtUMYSG7Avk=; b=leCSEHwhBKtlXNQL8PUXPyIBVo6mKm9PlDXt9aNr3I1aYGsX9w0moQ2H707ErrWVO9 /w1U9QXGYayalcP/N5SQqi8Dfl9eCdC9Uhs4pAyNqYO8eCx3kEKWBHr9ODdUcuUF4/0P wY1uNsTn7YFwPDzDIGKoPBmbzVIDgcRWihz7gtSrYmcdaOfTQs/ngFx0hzDmSIligV+G l8Dbu3NOE0BXGn8hFSMj9dBE5kxs563kpKRcOUSZZRcWOX7ht8lrtRP8qcsfZGowAmiA 1Huz8mSg7Tn0vZwf2d04oMtd6/Nm/Pkz40Inenkdp67NsEXvdKqb3ZnodvjAfxK0Mj4E NZ+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IUFTguL+; 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 m15-20020a05622a054f00b0041cb66ed83bsi9660446qtx.238.2023.11.15.12.58.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Nov 2023 12:58:40 -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=IUFTguL+; 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 1r3MvW-0004p0-RV; Wed, 15 Nov 2023 15:55:58 -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 1r3MvT-0004mL-MW for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvQ-00089d-CD for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:55 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-33139ecdca7so73634f8f.0 for ; Wed, 15 Nov 2023 12:55:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081747; x=1700686547; 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=IUFTguL+nP2xdPRP2OflRt+iPwAZwjvW/txpYCGKUsKoGakgAYV7DfyyiCR+zjSfDI k0LwdYzJM8Lq+W7ZnWk8YuKBhmRNOlJngmhxf0pYr7RWy+caoFPMmiOgYFe8DCFvyCIO LpySKtBR8VVnau+Fu8Tijp1ku31xW6faBjrDK1p17qGi5ujQipfGOaXLP7L3edKBK04C Pmao0qsVg7UA6gq27sNceQJuGOGlRO1ev8G4LgBOjCusOraHNk90O/GQMArBNS0SKS2g IuZ97JeuhPIBMDWVVqZoz6Kvut7Xs5EVJ1lJOI7CaRIH1FIBW6SetKoXuxUcAiTXMoJA AjhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081747; x=1700686547; 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=jGr0YZ4aGuczHwFA59ZLzHPfbBYtB6k4QnJiEdaLdRzu4RFgT93r9/nRLFndvt47wO aK2LwLHSukG0uSQU6IQF8UmpQPbEDpqg0tWfVb2yio/wJ5yR9dNtNqmH16QXWFjplgHa PR4QM+6FwqgyevySl49bL1iIM44KTCxB7XZ/5HyCffEfQtbDtmF1gvJOvsNZDyt3E1vq xFAgeEurJurMUaG7xi9l+G11ZBtbl8TDUnT91NPjJvbLu8gNwTtF1tU/eHH8Ta7G4nKH 1u0CW0qwE0eiIz3q5SFnSLXkC/Kvlx9CZ+4M0h6bwcHPVPyz9bUT++qchPlZH7REYHsB 0t4w== X-Gm-Message-State: AOJu0Yy4Zf9DX8DkTPyYyMJ9EvrFWAV5or58FcQy+C+kTzydU+Flw1BW GpRi04hh6Pt26sT2VXTDw41/pQ== X-Received: by 2002:adf:e6d1:0:b0:32d:8cfd:5780 with SMTP id y17-20020adfe6d1000000b0032d8cfd5780mr8055379wrm.27.1700081746832; Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n16-20020a5d67d0000000b0032da49e18fasm11432278wrw.23.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 23FB05F7B4; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss , Greg Manning Subject: [PATCH 04/10] plugins: fix win plugin tests on cross compile Date: Wed, 15 Nov 2023 20:55:36 +0000 Message-Id: <20231115205542.3092038-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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=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+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