From patchwork Tue Sep 15 18:54:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 98338 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 12D0BC88E77 for ; Tue, 15 Sep 2026 18:54:32 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.4273.1789498470205106584 for ; Tue, 15 Sep 2026 11:54:30 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=LUnJa4Vb; 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 EFE57152B for ; Tue, 15 Sep 2026 11:54:25 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 421193F7B4 for ; Tue, 15 Sep 2026 11:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1789498469; bh=4K55KmLGMUMoJm/29yNyTszbwo3P4wzPkP1MKv/ZZqg=; h=From:To:Subject:Date:From; b=LUnJa4VbXBjzelu5yLX7T4be8l6kkFcxdZ6bxktr9aCCIKvGgtbJSYPwbp7jruiJ7 9bRuOmiKZ6/4M5UljdWLmGQ8wbymc/m8WTJBndEckdZuml7UA2Idglix4D/UEMQTUS yUGxddNoC1PMXy97ToL+QejpS8F+EEWcrqDxnPuc= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2] libical: use PACKAGECONFIGS for gobject-introspection and vala support Date: Tue, 15 Sep 2026 19:54:26 +0100 Message-ID: <20260915185426.1393345-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Sep 2026 18:54:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/245866 No change to the arguments being passed, but makes the recipe easier to read. GI_DATA_ENABLED is disabled in native builds so there is no need for the override. Remove the assignment of VAPIGEN, cmake finds the binary on its own. Signed-off-by: Ross Burton --- meta/recipes-support/libical/libical_4.0.5.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-support/libical/libical_4.0.5.bb b/meta/recipes-support/libical/libical_4.0.5.bb index 952e2c60540..e9b093544f1 100644 --- a/meta/recipes-support/libical/libical_4.0.5.bb +++ b/meta/recipes-support/libical/libical_4.0.5.bb @@ -19,11 +19,14 @@ inherit cmake pkgconfig gobject-introspection vala github-releases DEPENDS += "libical-native" -PACKAGECONFIG ??= "icu glib" +PACKAGECONFIG ??= "icu glib \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'introspection vala', '', d)}" PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db" PACKAGECONFIG[glib] = "-DLIBICAL_GLIB=True,-DLIBICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2" # ICU is used for RSCALE (RFC7529) support PACKAGECONFIG[icu] = ",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu" +PACKAGECONFIG[introspection] = "-DLIBICAL_GOBJECT_INTROSPECTION=ON,-DLIBICAL_GOBJECT_INTROSPECTION=OFF" +PACKAGECONFIG[vala] = "-DLIBICAL_GLIB_VAPI=ON,-DLIBICAL_GLIB_VAPI=OFF" # No need to use perl-native, the host perl is sufficient. EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" @@ -32,11 +35,8 @@ EXTRA_OECMAKE += "-DLIBICAL_BUILD_TESTING=false" # doc build fails with linker error (??) for libical-glib so disable it EXTRA_OECMAKE += "-DLIBICAL_GLIB_BUILD_DOCS=false" # gobject-introspection -EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" -EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" -EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" -EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DLIBICAL_GOBJECT_INTROSPECTION=ON -DLIBICAL_GLIB_VAPI=ON', '-DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF', d)}" -EXTRA_OECMAKE:append:class-native = " -DLIBICAL_GOBJECT_INTROSPECTION=OFF -DLIBICAL_GLIB_VAPI=OFF" +EXTRA_OECMAKE += "-DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" +EXTRA_OECMAKE += "-DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" # no java EXTRA_OECMAKE += "-DLIBICAL_JAVA_BINDINGS=False"