Re: [Buildroot] [PATCH 1/1] package/sg3_utils: fix musl build

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Marek Belisko <marek.belisko@open-nandra.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/sg3_utils: fix musl build
Date: Sun, 14 Nov 2021 13:45:04 +0100	[thread overview]
Message-ID: <20211114124504.GW247986@scaer> (raw)
In-Reply-To: <20211114114342.1316711-1-fontaine.fabrice@gmail.com>

Fabrice, All,

On 2021-11-14 12:43 +0100, Fabrice Fontaine spake thusly:
> Fix the following build failure raised on musl since bump to version
> 1.47 in commit 710b0eaebeb25d7718bfb10e87f0d67adfaf8c2f and
> https://github.com/doug-gilbert/sg3_utils/commit/f0195003bb0c66ba55084b2f7e0fe982f08c5675:
> 
> sg_dd.c: In function 'main':
> sg_dd.c:2402:17: error: unknown type name 'uint'; did you mean 'int'?
>  2402 |                 uint off;
>       |                 ^~~~
>       |                 int
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/9ead59ffefefe2a4e3b94a153b3d23231736d882
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  .../0001-src-sg_dd.c-fix-musl-build.patch     | 39 +++++++++++++++++++
>  1 file changed, 39 insertions(+)
>  create mode 100644 package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch
> 
> diff --git a/package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch b/package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch
> new file mode 100644
> index 0000000000..50a81a78a4
> --- /dev/null
> +++ b/package/sg3_utils/0001-src-sg_dd.c-fix-musl-build.patch
> @@ -0,0 +1,39 @@
> +From c93ad13ecd8ddfbb8bb3e4d5d5ad7f3f2c633db6 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 14 Nov 2021 12:37:16 +0100
> +Subject: [PATCH] src/sg_dd.c: fix musl build
> +
> +Fix the following build failure on musl raised since version 1.47 and
> +https://github.com/doug-gilbert/sg3_utils/commit/f0195003bb0c66ba55084b2f7e0fe982f08c5675:
> +
> +sg_dd.c: In function 'main':
> +sg_dd.c:2402:17: error: unknown type name 'uint'; did you mean 'int'?
> + 2402 |                 uint off;
> +      |                 ^~~~
> +      |                 int
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/9ead59ffefefe2a4e3b94a153b3d23231736d882
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/doug-gilbert/sg3_utils/pull/7]
> +---
> + src/sg_dd.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/sg_dd.c b/src/sg_dd.c
> +index 9d05c93..35e2423 100644
> +--- a/src/sg_dd.c
> ++++ b/src/sg_dd.c
> +@@ -2399,7 +2399,7 @@ main(int argc, char * argv[])
> +             res = blocks * blk_sz;
> +             if (iflag.zero && iflag.ff && (blk_sz >= 4)) {
> +                 uint32_t pos = (uint32_t)skip;
> +-                uint off;
> ++                uint32_t off;
> + 
> +                 for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) {
> +                     for (j = 0; j < (blk_sz - 3); j += 4)
> +-- 
> +2.33.0
> +
> -- 
> 2.33.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot