Re: [oe] [meta-oe][PATCH 1/2] zchunk: upgrade 1.1.5 -> 1.1.6

[Martin Jansa]

The argp check added in:
https://github.com/zchunk/zchunk/commit/73f9f26d43f6786eadc49f7d43f1672e03d92b7f

fails in builds with Werror=return-type with:
Code:
 #include 
static error_t parse_opt (int key, char *arg, struct argp_state *state) {
argp_usage(state); }; void main() {}
Compiler stdout:

Compiler stderr:
 In file included from
zchunk/1.1.6-r0/recipe-sysroot/usr/include/bits/libc-header-start.h:33,
 from zchunk/1.1.6-r0/recipe-sysroot/usr/include/stdio.h:27,
 from zchunk/1.1.6-r0/recipe-sysroot/usr/include/argp.h:23,
 from
zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c:1:
zchunk/1.1.6-r0/recipe-sysroot/usr/include/features.h:397:4: warning:
#warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
  |^~~
zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c: In function
'parse_opt':
zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c:2:54: error: no
return statement in function returning non-void [-Werror=return-type]
2 | static error_t parse_opt (int key, char *arg, struct argp_state
*state) { argp_usage(state); }; void main() {}
  |  ^~
cc1: some warnings being treated as errors

and then build with glibc fails

../git/meson.build:26:4: ERROR: C library 'argp' not found

It was building fine in 1.1.5 in my world builds, because this argp check
wasn't there yet. Can you please fix it in upstream and do another upgrade?

Thanks

On Mon, Jun 1, 2020 at 1:52 PM Pierre-Jean Texier via lists.openembedded.org
 wrote:

> - Remove patches already in version
>
> Signed-off-by: Pierre-Jean Texier 
> ---
>  .../zchunk/0001-zck.h-fix-build-on-musl.patch  | 39 --
>  .../0002-unzck-fix-build-with-musl-libc.patch  | 61
> --
>  .../zchunk/{zchunk_1.1.5.bb => zchunk_1.1.6.bb}|  8 +--
>  3 files changed, 2 insertions(+), 106 deletions(-)
>  delete mode 100644
> meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
>  delete mode 100644
> meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
>  rename meta-oe/recipes-support/zchunk/{zchunk_1.1.5.bb => zchunk_1.1.6.bb}
> (66%)
>
> diff --git
> a/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
> b/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
> deleted file mode 100644
> index 64e0e8e..000
> ---
> a/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17 00:00:00 2001
> -From: Pierre-Jean Texier 
> -Date: Thu, 23 Jan 2020 19:14:40 +0100
> -Subject: [PATCH 1/2] zck.h: fix build on musl
> -
> -The ssize_t type requires the  header. This fixes build with
> musl
> -libc:
> -
> -include/zck.h:68:1: error: unknown type name 'ssize_t'; did you mean
> 'size_t'?
> -   68 | ssize_t zck_read(zckCtx *zck, char *dst, size_t dst_size)
> -  | ^~~
> -  | size_t
> -include/zck.h:81:1: error: unknown type name 'ssize_t'; did you mean
> 'size_t'?
> -   81 | ssize_t zck_write(zckCtx *zck, const char *src, const size_t
> src_size)
> -  | ^~~
> -  | size_t
> -
> -Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23]
> -
> -Signed-off-by: Pierre-Jean Texier 
> 
> - include/zck.h.in | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/include/zck.h.in b/include/zck.h.in
> -index 91d2557..b847576 100644
>  a/include/zck.h.in
> -+++ b/include/zck.h.in
> -@@ -5,6 +5,7 @@
> -
> - #include 
> - #include 
> -+#include 
> -
> - typedef enum zck_hash {
> - ZCK_HASH_SHA1,
> ---
> -2.7.4
> -
> diff --git
> a/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
> b/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
> deleted file mode 100644
> index a1c95bf..000
> ---
> a/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -From 72c55e3da59eccdfea3778d11f83862b58af723d Mon Sep 17 00:00:00 2001
> -From: Pierre-Jean Texier 
> -Date: Thu, 23 Jan 2020 22:42:40 +0100
> -Subject: [PATCH 2/2] unzck: fix build with musl libc
> -
> -On musl libc "stdout" is a preprocessor macro whose expansion leads to
> -compilation errors.
> -
> -Fixes:
> -
> -| In file included from ../git/src/unzck.c:31:
> -| ../git/src/unzck.c: In function 'parse_opt':
> -| ../git/src/unzck.c:78:24: error: expected identifier before '(' token
> -|78 | arguments->stdout = true;
> -|   |^~
> -| ../git/src/unzck.c: In function 'main':
> -| ../git/src/unzck.c:141:20: error: expected identifier before '(' token
> -|   141 | if(!(arguments.stdout)) {
> -|   |^~
> -
> -Upstream-Status: Submit

Re: [oe] [meta-oe][PATCH 1/2] zchunk: upgrade 1.1.5 -> 1.1.6

[Martin Jansa]

Now the same upgrade was merged to dunfell, are you going to fix it?

On Sun, Jun 14, 2020 at 1:41 PM Martin Jansa via lists.openembedded.org
 wrote:

> The argp check added in:
>
> https://github.com/zchunk/zchunk/commit/73f9f26d43f6786eadc49f7d43f1672e03d92b7f
>
> fails in builds with Werror=return-type with:
> Code:
>  #include 
> static error_t parse_opt (int key, char *arg, struct argp_state *state) {
> argp_usage(state); }; void main() {}
> Compiler stdout:
>
> Compiler stderr:
>  In file included from
> zchunk/1.1.6-r0/recipe-sysroot/usr/include/bits/libc-header-start.h:33,
>  from
> zchunk/1.1.6-r0/recipe-sysroot/usr/include/stdio.h:27,
>  from zchunk/1.1.6-r0/recipe-sysroot/usr/include/argp.h:23,
>  from
> zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c:1:
> zchunk/1.1.6-r0/recipe-sysroot/usr/include/features.h:397:4: warning:
> #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
>   397 | #  warning _FORTIFY_SOURCE requires compiling with optimization
> (-O)
>   |^~~
> zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c: In function
> 'parse_opt':
> zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c:2:54: error: no
> return statement in function returning non-void [-Werror=return-type]
> 2 | static error_t parse_opt (int key, char *arg, struct argp_state
> *state) { argp_usage(state); }; void main() {}
>   |  ^~
> cc1: some warnings being treated as errors
>
> and then build with glibc fails
>
> ../git/meson.build:26:4: ERROR: C library 'argp' not found
>
> It was building fine in 1.1.5 in my world builds, because this argp check
> wasn't there yet. Can you please fix it in upstream and do another upgrade?
>
> Thanks
>
> On Mon, Jun 1, 2020 at 1:52 PM Pierre-Jean Texier via
> lists.openembedded.org 
> wrote:
>
>> - Remove patches already in version
>>
>> Signed-off-by: Pierre-Jean Texier 
>> ---
>>  .../zchunk/0001-zck.h-fix-build-on-musl.patch  | 39 --
>>  .../0002-unzck-fix-build-with-musl-libc.patch  | 61
>> --
>>  .../zchunk/{zchunk_1.1.5.bb => zchunk_1.1.6.bb}|  8 +--
>>  3 files changed, 2 insertions(+), 106 deletions(-)
>>  delete mode 100644
>> meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
>>  delete mode 100644
>> meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
>>  rename meta-oe/recipes-support/zchunk/{zchunk_1.1.5.bb =>
>> zchunk_1.1.6.bb} (66%)
>>
>> diff --git
>> a/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
>> b/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
>> deleted file mode 100644
>> index 64e0e8e..000
>> ---
>> a/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
>> +++ /dev/null
>> @@ -1,39 +0,0 @@
>> -From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17 00:00:00 2001
>> -From: Pierre-Jean Texier 
>> -Date: Thu, 23 Jan 2020 19:14:40 +0100
>> -Subject: [PATCH 1/2] zck.h: fix build on musl
>> -
>> -The ssize_t type requires the  header. This fixes build
>> with musl
>> -libc:
>> -
>> -include/zck.h:68:1: error: unknown type name 'ssize_t'; did you mean
>> 'size_t'?
>> -   68 | ssize_t zck_read(zckCtx *zck, char *dst, size_t dst_size)
>> -  | ^~~
>> -  | size_t
>> -include/zck.h:81:1: error: unknown type name 'ssize_t'; did you mean
>> 'size_t'?
>> -   81 | ssize_t zck_write(zckCtx *zck, const char *src, const size_t
>> src_size)
>> -  | ^~~
>> -  | size_t
>> -
>> -Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23]
>> -
>> -Signed-off-by: Pierre-Jean Texier 
>> 
>> - include/zck.h.in | 1 +
>> - 1 file changed, 1 insertion(+)
>> -
>> -diff --git a/include/zck.h.in b/include/zck.h.in
>> -index 91d2557..b847576 100644
>>  a/include/zck.h.in
>> -+++ b/include/zck.h.in
>> -@@ -5,6 +5,7 @@
>> -
>> - #include 
>> - #include 
>> -+#include 
>> -
>> - typedef enum zck_hash {
>> - ZCK_HASH_SHA1,
>> ---
>> -2.7.4
>> -
>> diff --git
>> a/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
>> b/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
>> deleted file mode 100644
>> index a1c95bf..000
>> ---
>> a/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
>> +++ /dev/null
>> @@ -1,61 +0,0 @@
>> -From 72c55e3da59eccdfea3778d11f83862b58af723d Mon Sep 17 00:00:00 2001
>> -From: Pierre-Jean Texier 
>> -Date: Thu, 23 Jan 2020 22:42:40 +0100
>> -Subject: [PATCH 2/2] unzck: fix build with musl libc
>> -
>> -On musl libc "stdout" is a preprocessor macro whose expansion leads to
>> -compilation errors.
>> -
>> -Fixes:
>> -
>> -| In file included from ../git/src/unzck.c:31:
>> -| ../git/src/unzck.c: In function 'parse_opt':
>> -| ../git/src/unzck.c:78:24: error: expected identifier before '(' token
>>

Re: [oe] [meta-oe][PATCH 1/2] zchunk: upgrade 1.1.5 -> 1.1.6

[Pierre-Jean Texier via lists.openembedded.org]

Hi Martin,

Le 08/07/2020 à 09:53, Martin Jansa a écrit :

Now the same upgrade was merged to dunfell, are you going to fix it?


It seems I missed you're first e-mail, sorry about that.
On my side, I didn't see this failure during the upgrade.

I will check that.
--
Pierre-Jean Texier
Embedded Linux Engineer
https://koncepto.io
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#85663): 
https://lists.openembedded.org/g/openembedded-devel/message/85663
Mute This Topic: https://lists.openembedded.org/mt/74601708/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [oe] [meta-oe][PATCH 1/2] zchunk: upgrade 1.1.5 -> 1.1.6

[Khem Raj]

On 7/8/20 12:53 AM, Martin Jansa wrote:
> Now the same upgrade was merged to dunfell, are you going to fix it?
> 
> On Sun, Jun 14, 2020 at 1:41 PM Martin Jansa via lists.openembedded.org
> 
>  > wrote:
> 
> The argp check added in:
> 
> https://github.com/zchunk/zchunk/commit/73f9f26d43f6786eadc49f7d43f1672e03d92b7f
> 
> fails in builds with Werror=return-type with:
> Code:
>  #include 
> static error_t parse_opt (int key, char *arg, struct argp_state
> *state) { argp_usage(state); }; void main() {}
> Compiler stdout:
> 
> Compiler stderr:
>  In file included from
> zchunk/1.1.6-r0/recipe-sysroot/usr/include/bits/libc-header-start.h:33,
>                  from
> zchunk/1.1.6-r0/recipe-sysroot/usr/include/stdio.h:27,
>                  from
> zchunk/1.1.6-r0/recipe-sysroot/usr/include/argp.h:23,
>                  from
> zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c:1:
> zchunk/1.1.6-r0/recipe-sysroot/usr/include/features.h:397:4:
> warning: #warning _FORTIFY_SOURCE requires compiling with
> optimization (-O) [-Wcpp]
>   397 | #  warning _FORTIFY_SOURCE requires compiling with
> optimization (-O)
>       |    ^~~
> zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c: In
> function 'parse_opt':
> zchunk/1.1.6-r0/build/meson-private/tmpqwvjccnp/testfile.c:2:54:
> error: no return statement in function returning non-void
> [-Werror=return-type]
>     2 | static error_t parse_opt (int key, char *arg, struct
> argp_state *state) { argp_usage(state); }; void main() {}
>       |                                                      ^~
> cc1: some warnings being treated as errors

this is fine, but I think this warning should be enabled upstream by
default as well

> 
> and then build with glibc fails
> 
> ../git/meson.build:26:4: ERROR: C library 'argp' not found
> 
> It was building fine in 1.1.5 in my world builds, because this argp
> check wasn't there yet. Can you please fix it in upstream and do
> another upgrade?
> 
> Thanks
> 
> On Mon, Jun 1, 2020 at 1:52 PM Pierre-Jean Texier via
> lists.openembedded.org 
>  > wrote:
> 
> - Remove patches already in version
> 
> Signed-off-by: Pierre-Jean Texier  >
> ---
>  .../zchunk/0001-zck.h-fix-build-on-musl.patch      | 39
> --
>  .../0002-unzck-fix-build-with-musl-libc.patch      | 61
> --
>  .../zchunk/{zchunk_1.1.5.bb  =>
> zchunk_1.1.6.bb }    |  8 +--
>  3 files changed, 2 insertions(+), 106 deletions(-)
>  delete mode 100644
> 
> meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
>  delete mode 100644
> 
> meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
>  rename meta-oe/recipes-support/zchunk/{zchunk_1.1.5.bb
>  => zchunk_1.1.6.bb
> } (66%)
> 
> diff --git
> 
> a/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
> 
> b/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
> deleted file mode 100644
> index 64e0e8e..000
> ---
> 
> a/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17
> 00:00:00 2001
> -From: Pierre-Jean Texier  >
> -Date: Thu, 23 Jan 2020 19:14:40 +0100
> -Subject: [PATCH 1/2] zck.h: fix build on musl
> -
> -The ssize_t type requires the  header. This fixes
> build with musl
> -libc:
> -
> -include/zck.h:68:1: error: unknown type name 'ssize_t'; did you
> mean 'size_t'?
> -   68 | ssize_t zck_read(zckCtx *zck, char *dst, size_t dst_size)
> -      | ^~~
> -      | size_t
> -include/zck.h:81:1: error: unknown type name 'ssize_t'; did you
> mean 'size_t'?
> -   81 | ssize_t zck_write(zckCtx *zck, const char *src, const
> size_t src_size)
> -      | ^~~
> -      | size_t
> -     
> -Upstream-Status: Submitted
> [https://github.com/zchunk/zchunk/pull/23]
> -
> -Signed-off-by: Pierre-Jean Texier  >
> 
> - include/zck.h.in  | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/inc