diff mbox series

zchunk: upgrade 1.2.4 -> 1.3.0

Message ID 20230227093550.1131959-1-sbabic@denx.de
State Under Review
Headers show
Series zchunk: upgrade 1.2.4 -> 1.3.0 | expand

Commit Message

Stefano Babic Feb. 27, 2023, 9:35 a.m. UTC 
Release zchunk 1.3.0 with the following changes:
 * meson: Use global function in argp check
 * Add ZCK_NO_WRITE option to disable writing to a file

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 .../recipes-support/zchunk/files/clang.patch  | 35 -------------------
 .../{zchunk_1.2.4.bb => zchunk_1.3.0.bb}      |  5 ++-
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 meta-oe/recipes-support/zchunk/files/clang.patch
 rename meta-oe/recipes-support/zchunk/{zchunk_1.2.4.bb => zchunk_1.3.0.bb} (88%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/zchunk/files/clang.patch b/meta-oe/recipes-support/zchunk/files/clang.patch
deleted file mode 100644
index 86faf4aac..000000000
--- a/meta-oe/recipes-support/zchunk/files/clang.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From e69d907c3fe8765ce50ce1258648ebc8283ef8a7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
-
-Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/92/]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- 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 <argp.h>\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 <argp.h>\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.4.bb b/meta-oe/recipes-support/zchunk/zchunk_1.3.0.bb
similarity index 88%
rename from meta-oe/recipes-support/zchunk/zchunk_1.2.4.bb
rename to meta-oe/recipes-support/zchunk/zchunk_1.3.0.bb
index b4fd02760..07ab28375 100644
--- a/meta-oe/recipes-support/zchunk/zchunk_1.2.4.bb
+++ b/meta-oe/recipes-support/zchunk/zchunk_1.3.0.bb
@@ -4,10 +4,9 @@  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"
+SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main"
 
-SRCREV = "0bed8496262a71beadccd4e562bdac093ef6e06f"
+SRCREV = "1d8f14484b4e0b507487abe6c294fb2059b7b72f"
 S = "${WORKDIR}/git"
 
 DEPENDS = "zstd"