From: Peter Seiderer <ps.report@gmx.net>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix build with gcc 11
Date: Thu, 3 Jun 2021 12:05:19 +0200 [thread overview]
Message-ID: <20210603120519.386c7969@gmx.net> (raw)
In-Reply-To: <20210603055644.333578-1-fontaine.fabrice@gmail.com>
Hello Fabrice,
On Thu, 3 Jun 2021 07:56:44 +0200, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Fix the following build failure with gcc 11:
>
> /data/buildroot-autobuilder/instance-0/output-1/build/qt5base-5.15.2/include/QtCore/../../src/corelib/global/qfloat16.h:300:7: error: 'numeric_limits' is not a class template
> 300 | class numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> : public numeric_limits<float>
> | ^~~~~~~~~~~~~~
>
> Fixes:
> - http://autobuild.buildroot.org/results/9a7a987af40b8408ccdfcae4890008c7090b41a1
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Regards,
Peter
> ---
> ...Fix-build-with-GCC-11-include-limits.patch | 53 +++++++++++++++++++
> 1 file changed, 53 insertions(+)
> create mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch
>
> diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch
> new file mode 100644
> index 0000000000..f014a160d5
> --- /dev/null
> +++ b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch
> @@ -0,0 +1,53 @@
> +From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001
> +From: Thiago Macieira <thiago.macieira@intel.com>
> +Date: Mon, 18 Jan 2021 07:40:54 -0800
> +Subject: [PATCH] Fix build with GCC 11: include <limits>
> +
> +Fixes: QTBUG-90395
> +Pick-to: 6.0
> +Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
> +Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
> +
> +[Retrieved (and backported) from:
> +https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + src/corelib/global/qendian.h | 6 ++++--
> + src/corelib/global/qfloat16.h | 1 +
> + 2 files changed, 5 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
> +index 99b529f17cd..c874c5e47ab 100644
> +--- a/src/corelib/global/qendian.h
> ++++ b/src/corelib/global/qendian.h
> +@@ -1,7 +1,7 @@
> + /****************************************************************************
> + **
> +-** Copyright (C) 2016 The Qt Company Ltd.
> +-** Copyright (C) 2016 Intel Corporation.
> ++** Copyright (C) 2021 The Qt Company Ltd.
> ++** Copyright (C) 2021 Intel Corporation.
> + ** Contact: https://www.qt.io/licensing/
> + **
> + ** This file is part of the QtCore module of the Qt Toolkit.
> +@@ -44,6 +44,8 @@
> + #include <QtCore/qfloat16.h>
> + #include <QtCore/qglobal.h>
> +
> ++#include <limits>
> ++
> + // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
> + #include <stdlib.h>
> + #include <string.h>
> +diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
> +index e9477d2ecec..a25fac28862 100644
> +--- a/src/corelib/global/qfloat16.h
> ++++ b/src/corelib/global/qfloat16.h
> +@@ -44,6 +44,7 @@
> +
> + #include <QtCore/qglobal.h>
> + #include <QtCore/qmetatype.h>
> ++#include <limits>
> + #include <string.h>
> +
> + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
next prev parent reply other threads:[~2021-06-03 10:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 5:56 [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix build with gcc 11 Fabrice Fontaine
2021-06-03 10:05 ` Peter Seiderer [this message]
2021-06-05 21:03 ` Yann E. MORIN
2021-06-10 20:24 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2021-07-02 8:02 Maxim Kochetkov
2021-07-02 8:15 ` Bartosz Bilas
2021-07-02 8:25 ` Maxim Kochetkov
2021-07-02 22:09 ` Peter Seiderer
2021-07-02 22:12 ` Peter Seiderer
2021-07-04 8:43 ` Bartosz Bilas
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=20210603120519.386c7969@gmx.net \
--to=ps.report@gmx.net \
--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