From patchwork Thu Mar 30 18:50:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21952 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 62ACFC77B60 for ; Thu, 30 Mar 2023 18:50:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34317.1680202209585585376 for ; Thu, 30 Mar 2023 11:50:10 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E33942F4; Thu, 30 Mar 2023 11:50:52 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 214E63F663; Thu, 30 Mar 2023 11:50:08 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 1/3] llvm: remove redundant CMake variables Date: Thu, 30 Mar 2023 19:50:04 +0100 Message-Id: <20230330185006.306389-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 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, 30 Mar 2023 18:50:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179348 This recipe uses the cmake class, so there's no need to set the Ninja backend, or tell it where Python is, or that we're cross-compiling. Signed-off-by: Ross Burton --- meta/recipes-devtools/llvm/llvm_git.bb | 3 +-- meta/recipes-devtools/rust/rust-llvm_1.67.1.bb | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index f133653903e..f617b172310 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -82,9 +82,8 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_OPTIMIZED_TABLEGEN=ON \ -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ -DCMAKE_BUILD_TYPE=Release \ - -G Ninja" + " EXTRA_OECMAKE:append:class-target = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ diff --git a/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb b/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb index 4da11da8ef3..6304070debf 100644 --- a/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb +++ b/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb @@ -49,14 +49,12 @@ EXTRA_OECMAKE = " \ -DCMAKE_INSTALL_PREFIX:PATH=${libdir}/llvm-rust \ " EXTRA_OECMAKE:append:class-target = "\ - -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DLLVM_BUILD_TOOLS=OFF \ -DLLVM_TABLEGEN=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-tblgen \ -DLLVM_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config \ " EXTRA_OECMAKE:append:class-nativesdk = "\ - -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DLLVM_BUILD_TOOLS=OFF \ -DLLVM_TABLEGEN=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-tblgen \ -DLLVM_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config \ From patchwork Thu Mar 30 18:50:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21953 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 64DF2C77B62 for ; Thu, 30 Mar 2023 18:50:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.34227.1680202209821924900 for ; Thu, 30 Mar 2023 11:50:10 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 94668113E; Thu, 30 Mar 2023 11:50:53 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C27C13F663; Thu, 30 Mar 2023 11:50:08 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 2/3] libgit2: clean up CMake variables Date: Thu, 30 Mar 2023 19:50:05 +0100 Message-Id: <20230330185006.306389-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330185006.306389-1-ross.burton@arm.com> References: <20230330185006.306389-1-ross.burton@arm.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, 30 Mar 2023 18:50:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179349 LIB_INSTALL_DIR was removed in libgit2 1.0 when they moved to using GNUInstallDirs. BUILD_CLAR is now BUILD_TESTS as of libgit2 1.4. Signed-off-by: Ross Burton --- meta/recipes-support/libgit2/libgit2_1.6.3.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-support/libgit2/libgit2_1.6.3.bb b/meta/recipes-support/libgit2/libgit2_1.6.3.bb index 554e18e4daf..cab7d7a20a8 100644 --- a/meta/recipes-support/libgit2/libgit2_1.6.3.bb +++ b/meta/recipes-support/libgit2/libgit2_1.6.3.bb @@ -13,9 +13,8 @@ S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE = "\ - -DBUILD_CLAR=OFF \ + -DBUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLIB_INSTALL_DIR=${libdir} \ -DREGEX_BACKEND='pcre2' \ " From patchwork Thu Mar 30 18:50:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21951 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 68F98C6FD1D for ; Thu, 30 Mar 2023 18:50:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.34318.1680202210244772779 for ; Thu, 30 Mar 2023 11:50:10 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 40F53168F; Thu, 30 Mar 2023 11:50:54 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 789083F663; Thu, 30 Mar 2023 11:50:09 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 3/3] webkitgtk: clean up Python variables Date: Thu, 30 Mar 2023 19:50:06 +0100 Message-Id: <20230330185006.306389-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330185006.306389-1-ross.burton@arm.com> References: <20230330185006.306389-1-ross.burton@arm.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, 30 Mar 2023 18:50:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179350 The cmake bbclass already sets the path to the correct Python for us, and there appears to be no more scripts in the build which use 'python' explicitly. Signed-off-by: Ross Burton --- meta/recipes-sato/webkit/webkitgtk_2.38.5.bb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb index e52920883a0..832c8327ddc 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb @@ -70,20 +70,11 @@ PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" -# webkitgtk is full of /usr/bin/env python, particular for generating docs -do_configure[postfuncs] += "setup_python_link" -setup_python_link() { - if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then - ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python - fi -} - EXTRA_OECMAKE = " \ -DPORT=GTK \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ -DENABLE_MINIBROWSER=ON \ - -DPYTHON_EXECUTABLE=`which python3` \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_GAMEPAD=OFF \ "