package/zchunk: fix symbol conflict
PATCH 1/1 package/zchunk: fix symbol conflict
Backport a patch to fix a symbol conflict issue.
Fixes:
- http://autobuild.buildroot.net/results/225/22590a7038a40da3700d56c1f82f7dc74225702a
Signed-off-by James Hilliard <[email protected]>
--- ...002-zck-declare-write_data-as-static.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/zchunk/0002-zck-declare-write_data-as-static.patch
package/zchunk/0002-zck-declare-write_data-as-static.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 477c4e891bd4d9e41fcbaa07cd1a37c0975df5cc Mon Sep 17 00:00:00 2001 +From: James Hilliard <[email protected]> +Date: Wed, 4 May 2022 16:32:48 -0600 +Subject: [PATCH] zck: declare write_data as static + +This needs to be declared static to avoid a symbol conflict: +io.c:(.text+0xe8): multiple definition of `write_data'; src/zck.p/zck.c.o:zck.c:(.text+0x1f4): first defined here + +Fixes: + - http://autobuild.buildroot.net/results/225/22590a7038a40da3700d56c1f82f7dc74225702a + +Signed-off-by: James Hilliard <[email protected]> +[[email protected]: backport from upstream commit +477c4e891bd4d9e41fcbaa07cd1a37c0975df5cc] +--- + src/zck.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zck.c b/src/zck.c +index 7727479..83b2630 100644 +--- a/src/zck.c ++++ b/src/zck.c +@@ -159,7 +159,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { + + static struct argp argp = {options, parse_opt, args_doc, doc}; + +-void write_data(zckCtx *zck, char *data, ssize_t in_size) { ++static void write_data(zckCtx *zck, char *data, ssize_t in_size) { + if(zck_write(zck, data, in_size) < 0) { + LOG_ERROR("%s", zck_get_error(zck)); + exit(1); +-- +2.25.1 +
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Arnout Vandecappelle
AppliedQuoted 6 lines · James Hilliard
Backport a patch to fix a symbol conflict issue.
Fixes:
- http://autobuild.buildroot.net/results/225/22590a7038a40da3700d56c1f82f7dc74225702aSigned-off-by James Hilliard <[email protected]>
Applied to master, thanks.
Regards,
Arnout
Quoted 35 lines
--- ...002-zck-declare-write_data-as-static.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)create mode 100644
package/zchunk/0002-zck-declare-write_data-as-static.patchpackage/zchunk/0002-zck-declare-write_data-as-static.patch new file +24
-0@@ -0,0 +1,34 @@ +From 477c4e891bd4d9e41fcbaa07cd1a37c0975df5cc Mon Sep 17 00:00:00 2001 +From: James Hilliard <[email protected]> +Date: Wed, 4 May 2022 16:32:48 -0600 +Subject: [PATCH] zck: declare write_data as static + +This needs to be declared static to avoid a symbol conflict: +io.c:(.text+0xe8): multiple definition of `write_data'; src/zck.p/zck.c.o:zck.c:(.text+0x1f4): first defined here + +Fixes: + - http://autobuild.buildroot.net/results/225/22590a7038a40da3700d56c1f82f7dc74225702a + +Signed-off-by: James Hilliard <[email protected]> +[[email protected]: backport from upstream commit +477c4e891bd4d9e41fcbaa07cd1a37c0975df5cc] +--- + src/zck.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zck.c b/src/zck.c +index 7727479..83b2630 100644 +--- a/src/zck.c ++++ b/src/zck.c +@@ -159,7 +159,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { +
package/zchunk/0002-zck-declare-write_data-as-static.patch line 34
Quoted 10 lines
package/zchunk/0002-zck-declare-write_data-as-static.patch new file +10
-0+ static struct argp argp = {options, parse_opt, args_doc, doc}; + +-void write_data(zckCtx *zck, char *data, ssize_t in_size) { ++static void write_data(zckCtx *zck, char *data, ssize_t in_size) { + if(zck_write(zck, data, in_size) < 0) { + LOG_ERROR("%s", zck_get_error(zck)); + exit(1); +-- +2.25.1 +
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot