From patchwork Wed Sep 10 13:48:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 69964 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 0E184CA0FED for ; Wed, 10 Sep 2025 13:48:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.18305.1757512092560018104 for ; Wed, 10 Sep 2025 06:48:12 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 CD0601595 for ; Wed, 10 Sep 2025 06:48:03 -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 AE8CF3F63F for ; Wed, 10 Sep 2025 06:48:11 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/2] libical: update patch status Date: Wed, 10 Sep 2025 14:48:06 +0100 Message-ID: <20250910134807.2366064-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 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 ; Wed, 10 Sep 2025 13:48:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223214 The 0001-cmake-Do-not-export-CC-into-gir-compiler.patch changes have been merged upstream. Signed-off-by: Ross Burton --- .../libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch index 0f0dadb4e4c..4027c218c59 100644 --- a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch +++ b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch @@ -8,7 +8,7 @@ compiler rather than just CC variable, therefore let it use the default values from environment and not synthesize it from CMAKE_C_COMPILER just for this case. -Upstream-Status: Submitted [https://github.com/libical/libical/pull/552] +Upstream-Status: Backport [https://github.com/libical/libical/pull/552] Signed-off-by: Khem Raj --- cmake/modules/GObjectIntrospectionMacros.cmake | 3 +-- From patchwork Wed Sep 10 13:48:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 69965 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 0F0D1CAC583 for ; Wed, 10 Sep 2025 13:48:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.18306.1757512093253913901 for ; Wed, 10 Sep 2025 06:48:13 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 735F816F8 for ; Wed, 10 Sep 2025 06:48:04 -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 607483F63F for ; Wed, 10 Sep 2025 06:48:12 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/2] libical: improve buildpath situation Date: Wed, 10 Sep 2025 14:48:07 +0100 Message-ID: <20250910134807.2366064-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250910134807.2366064-1-ross.burton@arm.com> References: <20250910134807.2366064-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 ; Wed, 10 Sep 2025 13:48:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223215 Take an upstream patch to remove buildpaths from the generator's CMake files, so we don't need to sed them out. Also, the generator tool is only needed when cross-compiling libical, so we don't actually need to install it in the target package. This has the nice side-effect of removing libxml2 from the target RDEPENDS as it is only used in the tool. Signed-off-by: Ross Burton --- .../libical/libical/flags.patch | 40 +++++++++++++++++++ .../recipes-support/libical/libical_3.0.20.bb | 13 +++--- 2 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-support/libical/libical/flags.patch diff --git a/meta/recipes-support/libical/libical/flags.patch b/meta/recipes-support/libical/libical/flags.patch new file mode 100644 index 00000000000..5fa4b479ee3 --- /dev/null +++ b/meta/recipes-support/libical/libical/flags.patch @@ -0,0 +1,40 @@ +From a5642fa1cd8c835209b39ec99e534d341779c985 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Wed, 10 Sep 2025 09:52:37 +0200 +Subject: [PATCH] libical-glib: Hide some target options in the installed CMake + files + +The build paths could be shown in the installed .cmake files, thus +hide them from there, because they are needed. + +Closes https://github.com/libical/libical/issues/532 + +Upstream-Status: Submitted [https://github.com/libical/libical/pull/1010] +Signed-off-by: Ross Burton +--- + src/libical-glib/CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt +index 9f69e9c5..aa55e013 100644 +--- a/src/libical-glib/CMakeLists.txt ++++ b/src/libical-glib/CMakeLists.txt +@@ -8,8 +8,8 @@ add_executable(ical-glib-src-generator + tools/xml-parser.h + ) + +-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\") +-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES}) ++target_compile_options(ical-glib-src-generator PRIVATE ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\") ++target_link_libraries(ical-glib-src-generator PRIVATE ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES}) + + install( + TARGETS ical-glib-src-generator +@@ -130,7 +130,7 @@ target_link_libraries(ical-glib PRIVATE ical ${GLIB_LIBRARIES}) + if(NOT SHARED_ONLY AND NOT STATIC_ONLY) + add_library(ical-glib-static STATIC ${LIBICAL_GLIB_SOURCES}) + add_dependencies(ical-glib-static ical-header) +- target_compile_options(ical-glib-static PUBLIC ${GLIB_CFLAGS} -DG_LOG_DOMAIN="libical-glib" -DLIBICAL_GLIB_COMPILATION) ++ target_compile_options(ical-glib-static PRIVATE ${GLIB_CFLAGS} -DG_LOG_DOMAIN="libical-glib" -DLIBICAL_GLIB_COMPILATION) + target_link_libraries(ical-glib-static ${GLIB_LIBRARIES}) + endif() diff --git a/meta/recipes-support/libical/libical_3.0.20.bb b/meta/recipes-support/libical/libical_3.0.20.bb index d62c88e3477..7f85522e91c 100644 --- a/meta/recipes-support/libical/libical_3.0.20.bb +++ b/meta/recipes-support/libical/libical_3.0.20.bb @@ -14,6 +14,7 @@ SECTION = "libs" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ + file://flags.patch \ " SRC_URI[sha256sum] = "e73de92f5a6ce84c1b00306446b290a2b08cdf0a80988eca0a2c9d5c3510b4c2" @@ -45,11 +46,13 @@ EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING do_install:append () { # Remove build host references (https://github.com/libical/libical/issues/532) - sed -i \ - -e 's,${STAGING_LIBDIR},${libdir},g' \ - -e 's,${STAGING_INCDIR},${includedir},g' \ - ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake \ - ${D}${libdir}/cmake/LibIcal/Ical*.cmake + sed -i -e 's,${STAGING_LIBDIR},${libdir},g' ${D}${libdir}/cmake/LibIcal/LibIcalTargets.cmake +} + +# This tool is only needed to cross-compile, delete it from the target packages +do_install:append:class-target() { + rm -f ${D}${libexecdir}/libical/ical-glib-src-generator + rm -f ${D}${libdir}/cmake/LibIcal/IcalGlibSrcGenerator*.cmake } BBCLASSEXTEND = "native"