From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 27 May 2021 08:46:29 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lm9mn-0002mc-CI for lore@lore.pengutronix.de; Thu, 27 May 2021 08:46:29 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lm9mn-0006ix-3I; Thu, 27 May 2021 08:46:29 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lm9lo-0005m5-16; Thu, 27 May 2021 08:45:28 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lm9ln-0006U5-HR; Thu, 27 May 2021 08:45:27 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lm9ln-00GwyJ-Ec; Thu, 27 May 2021 08:45:27 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 27 May 2021 08:45:27 +0200 Message-Id: <20210527064527.4039892-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210503103743.31995-5-l.stach@pengutronix.de> References: <20210503103743.31995-5-l.stach@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] qt5: fix build with GCC11 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lucas Stach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as cf8088742976a59972ed26d82fb715d025cdddad. Michael [sent from post-receive hook] On Thu, 27 May 2021 08:45:27 +0200, Lucas Stach wrote: > Some of those files are used to build host-side tools, so those changes are > needed to fix the build on a host with GCC11. > > Signed-off-by: Lucas Stach > Message-Id: <20210503103743.31995-5-l.stach@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch > new file mode 100644 > index 000000000000..33138cc3623c > --- /dev/null > +++ b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch > @@ -0,0 +1,69 @@ > +From: Lucas Stach > +Date: Sat, 1 May 2021 00:57:24 +0200 > +Subject: [PATCH] qtbase: include limits where necessary > + > +Upstream fixes: > +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 > +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 > + > +Fixes build with GCC11, which changed internal includes so that > +limits isn't implicitly pulled in some cases. > + > +Signed-off-by: Lucas Stach > +--- > + qtbase/src/corelib/global/qendian.h | 2 ++ > + qtbase/src/corelib/global/qfloat16.h | 1 + > + qtbase/src/corelib/text/qbytearraymatcher.h | 2 ++ > + qtbase/src/corelib/tools/qoffsetstringarray_p.h | 1 + > + 4 files changed, 6 insertions(+) > + > +diff --git a/qtbase/src/corelib/global/qendian.h b/qtbase/src/corelib/global/qendian.h > +index 257efbbdbecf..a97776c761b7 100644 > +--- a/qtbase/src/corelib/global/qendian.h > ++++ b/qtbase/src/corelib/global/qendian.h > +@@ -44,6 +44,8 @@ > + #include > + #include > + > ++#include > ++ > + // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems > + #include > + #include > +diff --git a/qtbase/src/corelib/global/qfloat16.h b/qtbase/src/corelib/global/qfloat16.h > +index c7a9c87af322..5302be072ed8 100644 > +--- a/qtbase/src/corelib/global/qfloat16.h > ++++ b/qtbase/src/corelib/global/qfloat16.h > +@@ -43,6 +43,7 @@ > + > + #include > + #include > ++#include > + #include > + > + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) > +diff --git a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h > +index 0eedfc1d2035..f5f9bef7b87c 100644 > +--- a/qtbase/src/corelib/text/qbytearraymatcher.h > ++++ b/qtbase/src/corelib/text/qbytearraymatcher.h > +@@ -42,6 +42,8 @@ > + > + #include > + > ++#include > ++ > + QT_BEGIN_NAMESPACE > + > + > +diff --git a/qtbase/src/corelib/tools/qoffsetstringarray_p.h b/qtbase/src/corelib/tools/qoffsetstringarray_p.h > +index 4dd9e9603bc1..8b3fbfe55985 100644 > +--- a/qtbase/src/corelib/tools/qoffsetstringarray_p.h > ++++ b/qtbase/src/corelib/tools/qoffsetstringarray_p.h > +@@ -53,6 +53,7 @@ > + > + #include "private/qglobal_p.h" > + > ++#include > + #include > + #include > + > diff --git a/patches/qt-everywhere-src-5.15.2/series b/patches/qt-everywhere-src-5.15.2/series > index 68b5075b33b2..226529352040 100644 > --- a/patches/qt-everywhere-src-5.15.2/series > +++ b/patches/qt-everywhere-src-5.15.2/series > @@ -7,4 +7,5 @@ > 0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > 0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > 0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch > -# 4b456a724e88b1f3c6125e3941898e96 - git-ptx-patches magic > +0008-qtbase-include-limits-where-necessary.patch > +# 0339a08cc8ad82af4c6542508057d7e7 - git-ptx-patches magic _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de