From patchwork Thu Feb 23 12:32:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 20031 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 9A609C636D6 for ; Thu, 23 Feb 2023 12:32:49 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9231.1677155562173749080 for ; Thu, 23 Feb 2023 04:32:42 -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 C6A3EC14; Thu, 23 Feb 2023 04:33:24 -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 5C9183F881; Thu, 23 Feb 2023 04:32:41 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH v3] zchunk: upgrade to 1.2.4 Date: Thu, 23 Feb 2023 12:32:39 +0000 Message-Id: <20230223123239.1727935-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, 23 Feb 2023 12:32:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101223 Add a patch submitted upstream to fix the argp detection with clang. Signed-off-by: Ross Burton --- .../recipes-support/zchunk/files/clang.patch | 35 +++++++++++++++++++ .../recipes-support/zchunk/zchunk_1.2.0.bb | 22 ------------ .../recipes-support/zchunk/zchunk_1.2.4.bb | 25 +++++++++++++ 3 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 meta-oe/recipes-support/zchunk/files/clang.patch delete mode 100644 meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb create mode 100644 meta-oe/recipes-support/zchunk/zchunk_1.2.4.bb diff --git a/meta-oe/recipes-support/zchunk/files/clang.patch b/meta-oe/recipes-support/zchunk/files/clang.patch new file mode 100644 index 0000000000..86faf4aac7 --- /dev/null +++ b/meta-oe/recipes-support/zchunk/files/clang.patch @@ -0,0 +1,35 @@ +From e69d907c3fe8765ce50ce1258648ebc8283ef8a7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Feb 2023 14:55:07 -0800 +Subject: [PATCH] meson: Use global function in argp check + +clang is optimizing away parse_opt() since its marked static and not +used in main(), make life a bit harder for clang :) +removing static now emits the global symbols to be resolved during link +and when libargp is missing the error is thrown rightly + +riscv64-yoe-linux-musl-ld: /tmp/a-5ba039.o: in function `.Lpcrel_hi0': +a.c:(.text+0x44): undefined reference to `argp_state_help' +clang-16: error: linker command failed with exit code 1 (use -v to see invocation) + +Signed-off-by: Khem Raj + +Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/92/] +Signed-off-by: Ross Burton +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3b92d58..ab54abd 100644 +--- a/meson.build ++++ b/meson.build +@@ -57,7 +57,7 @@ if host_machine.system() == 'windows' + endif + + # argp-standalone dependency (if required) +-if build_machine.system() == 'windows' or build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include \nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') ++if build_machine.system() == 'windows' or build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include \nerror_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') + argplib = cc.find_library('argp', has_headers : ['argp.h'], required: false) + if not argplib.found() + argplib = dependency('argp-standalone') diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb deleted file mode 100644 index 0baea5032a..0000000000 --- a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" -AUTHOR = "Jonathan Dieter" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" - -SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" - -SRCREV = "dd6a30a1e4e8b738b0cafc682f3c00e7706134e5" -S = "${WORKDIR}/git" - -DEPENDS = "\ - curl \ - zstd \ - " - -DEPENDS:append:libc-musl = " argp-standalone" -LDFLAGS:append:libc-musl = " -largp" - -inherit meson pkgconfig - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.2.4.bb b/meta-oe/recipes-support/zchunk/zchunk_1.2.4.bb new file mode 100644 index 0000000000..b4fd027603 --- /dev/null +++ b/meta-oe/recipes-support/zchunk/zchunk_1.2.4.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" +AUTHOR = "Jonathan Dieter" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" + +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main \ + file://clang.patch" + +SRCREV = "0bed8496262a71beadccd4e562bdac093ef6e06f" +S = "${WORKDIR}/git" + +DEPENDS = "zstd" +DEPENDS:append:libc-musl = " argp-standalone" + +inherit meson pkgconfig lib_package + +PACKAGECONFIG ??= "openssl zckdl" + +# zckdl gets packaged into zchunk-bin +PACKAGECONFIG[zckdl] = "-Dwith-curl=enabled,-Dwith-curl=disabled,curl" +# Use OpenSSL primitives for SHA +PACKAGECONFIG[openssl] = "-Dwith-openssl=enabled,-Dwith-openssl=disabled,openssl" + +BBCLASSEXTEND = "native nativesdk"