From patchwork Thu Feb 22 10:29:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enguerrand de Ribaucourt X-Patchwork-Id: 39912 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4F1BC48BF8 for ; Thu, 22 Feb 2024 10:30:26 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web11.9922.1708597817581005749 for ; Thu, 22 Feb 2024 02:30:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=oesGeFP/; spf=pass (domain: savoirfairelinux.com, ip: 208.88.110.44, mailfrom: enguerrand.de-ribaucourt@savoirfairelinux.com) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id CCDBF9C4AE3; Thu, 22 Feb 2024 05:30:16 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10032) with ESMTP id bOB-dleI_G9z; Thu, 22 Feb 2024 05:30:16 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 2CAC49C489C; Thu, 22 Feb 2024 05:30:16 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 2CAC49C489C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1708597816; bh=Cc/DlJhYW5al8c3EfDEHCtXUsVz1RP4o+uOHvYZSJPk=; h=From:To:Date:Message-Id:MIME-Version; b=oesGeFP/XLc4AAlj8hoPtBnJTLOIhzA7Fblx61bc39jyGYSmszM7WjsvdyQaRS3WQ as1uuTJzugrTmHO1FXaLknAohRhz58DkkyF0kHvlr2nm5UHAhFYK1olOoslGqVFFsY Gg6Nv2QPkvcYfGq76R4MZQ1srTlYm2T3u815WpshLrekl3eOpGHDvG3Wg04NO+n+xN VGjRsSA0vY0aqJ6dudVhDvHQcqvyoCYt016GPa0O5rbStohUwEQZfL4y03XOG8cTt+ 8RFw7u0gsYj7Ng0h5nZisngxDDeB2RbivpRLpOlLFoYmjxfPu6HzikAwSFgufuGfcT FA5EEcM6Ea3fw== X-Virus-Scanned: amavis at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10026) with ESMTP id Unww7-1dZieR; Thu, 22 Feb 2024 05:30:16 -0500 (EST) Received: from sfl-deribaucourt.rennes.sfl (lmontsouris-657-1-69-118.w80-15.abo.wanadoo.fr [80.15.101.118]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 575599C4AC2; Thu, 22 Feb 2024 05:30:15 -0500 (EST) From: Enguerrand de Ribaucourt To: openembedded-core@lists.openembedded.org Cc: adrian.freihofer@gmail.com, Ross.Burton@arm.com, mohammed.raza@savoirfairelinux.com, richard.purdie@linuxfoundation.org, Enguerrand de Ribaucourt Subject: [PATCH 1/2] devtool: ide: define compilerPath for meson projects Date: Thu, 22 Feb 2024 11:29:55 +0100 Message-Id: <20240222102956.346542-2-enguerrand.de-ribaucourt@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222102956.346542-1-enguerrand.de-ribaucourt@savoirfairelinux.com> References: <20240222102956.346542-1-enguerrand.de-ribaucourt@savoirfairelinux.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 22 Feb 2024 10:30:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196009 The compile_commands.json file output by meson uses the compiler as if present in the $PATH. However, when using an IDE, the $PATH used by bitbake is not there. The vscode-cpptools now allows to define the compilerPath in addition to replace the one from compile_commands.json. Signed-off-by: Enguerrand de Ribaucourt --- scripts/lib/devtool/ide_plugins/ide_code.py | 1 + scripts/lib/devtool/ide_sdk.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/scripts/lib/devtool/ide_plugins/ide_code.py b/scripts/lib/devtool/ide_plugins/ide_code.py index f44665ed872..d5e3a4f4215 100644 --- a/scripts/lib/devtool/ide_plugins/ide_code.py +++ b/scripts/lib/devtool/ide_plugins/ide_code.py @@ -194,6 +194,7 @@ class IdeVSCode(IdeBase): properties_dict["configurationProvider"] = "ms-vscode.cmake-tools" elif modified_recipe.build_tool is BuildTool.MESON: properties_dict["configurationProvider"] = "mesonbuild.mesonbuild" + properties_dict["compilerPath"] = os.path.join(modified_recipe.staging_bindir_toolchain, modified_recipe.cxx.split()[0]) else: # no C/C++ build return diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 14679744807..b52b52ae738 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -345,6 +345,7 @@ class RecipeModified: self.base_libdir = recipe_d.getVar('base_libdir') self.bblayers = recipe_d.getVar('BBLAYERS').split() self.bpn = recipe_d.getVar('BPN') + self.cxx = recipe_d.getVar('CXX') self.d = recipe_d.getVar('D') self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD') self.fakerootenv = recipe_d.getVar('FAKEROOTENV') @@ -360,6 +361,8 @@ class RecipeModified: recipe_d.getVar('RECIPE_SYSROOT')) self.recipe_sysroot_native = os.path.realpath( recipe_d.getVar('RECIPE_SYSROOT_NATIVE')) + self.staging_bindir_toolchain = os.path.realpath( + recipe_d.getVar('STAGING_BINDIR_TOOLCHAIN')) self.staging_incdir = os.path.realpath( recipe_d.getVar('STAGING_INCDIR')) self.strip_cmd = recipe_d.getVar('STRIP') From patchwork Thu Feb 22 10:29:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enguerrand de Ribaucourt X-Patchwork-Id: 39911 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5ABAC48BEB for ; Thu, 22 Feb 2024 10:30:26 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web11.9925.1708597818647570412 for ; Thu, 22 Feb 2024 02:30:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=BUUzRmFh; spf=pass (domain: savoirfairelinux.com, ip: 208.88.110.44, mailfrom: enguerrand.de-ribaucourt@savoirfairelinux.com) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id EA7219C4A0F; Thu, 22 Feb 2024 05:30:17 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10032) with ESMTP id 31cUg8lebQun; Thu, 22 Feb 2024 05:30:17 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 1E7F29C489C; Thu, 22 Feb 2024 05:30:17 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 1E7F29C489C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1708597817; bh=iByMOLODXm3ztf0jeiY04S/A2R9sTfn9dUsyvVs7oXE=; h=From:To:Date:Message-Id:MIME-Version; b=BUUzRmFhPvdfO8LK/tuJZb82tXi58d+TTQqQ93Gy0ZQdxRhBNpPNxbZXj0kKDw9P+ VX7sOlMon7/fc0h6YO/P7HIdTAnn/cS/W0dhcX9lzDyPlt9NB6/purq5ijIuRiSYiq F7Lffj/WWvjvOoM0KO0XUtcQm15tPKPJpY70I0L4Bw/BWEyw0VJTWpdqtItPYqgXAl UT6fwRLWX6JrqtcYtkLqCzLtP2pW8Ndo+zSRUrSEOH9EfJOaU7lljnSiBHRg5faGJe JoyPwEVX5pu3Pkav/wKudWNdeS8q1saEQGefpEhLHOocD28iVBkTlA68DqeTYubrZp QAYqSh7vtM3hw== X-Virus-Scanned: amavis at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10026) with ESMTP id 9W0pl4nZ-T0W; Thu, 22 Feb 2024 05:30:17 -0500 (EST) Received: from sfl-deribaucourt.rennes.sfl (lmontsouris-657-1-69-118.w80-15.abo.wanadoo.fr [80.15.101.118]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 4A7919C4A0F; Thu, 22 Feb 2024 05:30:16 -0500 (EST) From: Enguerrand de Ribaucourt To: openembedded-core@lists.openembedded.org Cc: adrian.freihofer@gmail.com, Ross.Burton@arm.com, mohammed.raza@savoirfairelinux.com, richard.purdie@linuxfoundation.org, Enguerrand de Ribaucourt Subject: [PATCH 2/2] Revert "meson: use absolute cross-compiler paths" Date: Thu, 22 Feb 2024 11:29:56 +0100 Message-Id: <20240222102956.346542-3-enguerrand.de-ribaucourt@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222102956.346542-1-enguerrand.de-ribaucourt@savoirfairelinux.com> References: <20240222102956.346542-1-enguerrand.de-ribaucourt@savoirfairelinux.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 22 Feb 2024 10:30:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/196010 This reverts commit fc8e5d7c13f62e987b76971116cf290fd01a0c8f. We need to use the absolute path to the compiler so that the VSCode configuration generated by devtool ide-sdk could lint meson projects. A feature was just added to vscode-cpptools to support conveying the compilerPath in addition to the compile_commands.json. The next commits adds the necessary configuration. We can revert this one and keep the meson paths as they were. Signed-off-by: Enguerrand de Ribaucourt --- meta/classes-recipe/meson-routines.bbclass | 6 ------ meta/classes-recipe/meson.bbclass | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/meta/classes-recipe/meson-routines.bbclass b/meta/classes-recipe/meson-routines.bbclass index 9925465ed8f..a944a8fff1c 100644 --- a/meta/classes-recipe/meson-routines.bbclass +++ b/meta/classes-recipe/meson-routines.bbclass @@ -10,12 +10,6 @@ def meson_array(var, d): items = d.getVar(var).split() return repr(items[0] if len(items) == 1 else items) -def meson_array_abspath(var, d): - import shutil - items = d.getVar(var).split() - items[0] = shutil.which(items[0]) or items[0] - return repr(items[0] if len(items) == 1 else items) - # Map our ARCH values to what Meson expects: # http://mesonbuild.com/Reference-tables.html#cpu-families def meson_cpu_family(var, d): diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index 31675cf42d1..03fa2c06eb4 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -64,13 +64,10 @@ addtask write_config before do_configure do_write_config[vardeps] += "CC CXX AR NM STRIP READELF OBJCOPY CFLAGS CXXFLAGS LDFLAGS RUSTC RUSTFLAGS EXEWRAPPER_ENABLED" do_write_config() { # This needs to be Py to split the args into single-element lists - # The generated compile_commands.json file can be used by external IDEs - # which do not know the $PATH set-up by bitbake. They need the absolute - # compiler paths. cat >${WORKDIR}/meson.cross <