From patchwork Mon Dec 13 17:46:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 924 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 8E574C433EF for ; Mon, 13 Dec 2021 17:46:06 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.14648.1639417565046573132 for ; Mon, 13 Dec 2021 09:46:05 -0800 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 178CE6D for ; Mon, 13 Dec 2021 09:46:04 -0800 (PST) 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 ESMTPSA id B30313F73B for ; Mon, 13 Dec 2021 09:46:03 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH] libical: upgrade to 3.0.12 Date: Mon, 13 Dec 2021 17:46:01 +0000 Message-Id: <20211213174601.643090-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.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 ; Mon, 13 Dec 2021 17:46:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159657 Disable tests to save some build time as we can't install them. Signed-off-by: Ross Burton --- .../libical/{libical_3.0.11.bb => libical_3.0.12.bb} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) rename meta/recipes-support/libical/{libical_3.0.11.bb => libical_3.0.12.bb} (83%) diff --git a/meta/recipes-support/libical/libical_3.0.11.bb b/meta/recipes-support/libical/libical_3.0.12.bb similarity index 83% rename from meta/recipes-support/libical/libical_3.0.11.bb rename to meta/recipes-support/libical/libical_3.0.12.bb index b16081e9e28..b2b2211b9b4 100644 --- a/meta/recipes-support/libical/libical_3.0.11.bb +++ b/meta/recipes-support/libical/libical_3.0.12.bb @@ -12,14 +12,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ " SECTION = "libs" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ -" -SRC_URI[sha256sum] = "1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "35095a4cc1a061a3de0f332c2dc728226cf127fa0baa818e9f8856cee6d35830" UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake pkgconfig -DEPENDS:append:class-target = " libical-native" +DEPENDS += "libical-native" PACKAGECONFIG ??= "icu glib" PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db" @@ -29,13 +28,16 @@ PACKAGECONFIG[icu] = ",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu" # No need to use perl-native, the host perl is sufficient. EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" +# Disable the test suite as we can't install it +EXTRA_OECMAKE += "-DLIBICAL_BUILD_TESTING=false" # doc build fails with linker error (??) for libical-glib so disable it EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" +# Tell the cross-libical where the tool it needs to build is EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" do_install:append () { - # Remove build host references + # 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' \