From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/p7zip: fix build with gcc 10
Date: Tue, 19 May 2020 21:03:03 +0200 [thread overview]
Message-ID: <20200519190303.GE27030@scaer> (raw)
In-Reply-To: <20200519133523.3069943-1-stefan.sorensen@spectralink.com>
Stefan, All,
On 2020-05-19 15:35 +0200, Stefan S?rensen spake thusly:
> Signed-off-by: Stefan S?rensen <stefan.sorensen@spectralink.com>
Applied to master, thanks.
I was going to say "do not forget to send upstream", but upstream seems
to dead, or stuck in some mess...
Regards,
Yann E. MORIN.
> ---
> .../p7zip/0004-Fix-build-with-gcc-10.patch | 32 +++++++++++++++++++
> 1 file changed, 32 insertions(+)
> create mode 100644 package/p7zip/0004-Fix-build-with-gcc-10.patch
>
> diff --git a/package/p7zip/0004-Fix-build-with-gcc-10.patch b/package/p7zip/0004-Fix-build-with-gcc-10.patch
> new file mode 100644
> index 0000000000..b01833db29
> --- /dev/null
> +++ b/package/p7zip/0004-Fix-build-with-gcc-10.patch
> @@ -0,0 +1,32 @@
> +From 78b760eae21d7b340c69e8abab8ca706e1e00adc Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <stefan.sorensen@spectralink.com>
> +Date: Mon, 4 May 2020 09:19:46 +0200
> +Subject: [PATCH] Fix build with gcc 10.
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Add cast to code that mixes HRESULT (aka long) and DWORD (aka unsigned
> +int) which causes an narrowing error with gcc 10.
> +
> +Signed-off-by: Stefan S?rensen <stefan.sorensen@spectralink.com>
> +---
> + CPP/Windows/ErrorMsg.cpp | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp
> +index 99684ae..ab48352 100644
> +--- a/CPP/Windows/ErrorMsg.cpp
> ++++ b/CPP/Windows/ErrorMsg.cpp
> +@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode)
> + const char * txt = 0;
> + AString msg;
> +
> +- switch(errorCode) {
> ++ switch((HRESULT)errorCode) {
> + case ERROR_NO_MORE_FILES : txt = "No more files"; break ;
> + case E_NOTIMPL : txt = "E_NOTIMPL"; break ;
> + case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ;
> +--
> +2.26.2
> +
> --
> 2.25.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/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. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2020-05-19 19:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 13:35 [Buildroot] [PATCH] package/p7zip: fix build with gcc 10 Stefan Sørensen
2020-05-19 19:03 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200519190303.GE27030@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox