Message ID | 20221030230410.982946-1-paul@crapouillou.net |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/glmark2: add patch to fix GCC 12 build | expand |
Le dim. 30 oct. 2022 à 23:04:10 +0000, Paul Cercueil <paul@crapouillou.net> a écrit : > Add a patch cherry-picked from upstream to fix the build with GCC 12. > > Upstream commit is d1ca3f53c96dc8a4048b17dc16147a8fac782d4a. > I don't know if it fixes any autobuilder errors, I noticed the bug > when > building locally. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > ...ibmatrix-Add-missing-utility-include.patch | 29 > +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 > package/glmark2/0002-libmatrix-Add-missing-utility-include.patch > > diff --git > a/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch > b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch > new file mode 100644 > index 0000000000..2a658393ae > --- /dev/null > +++ b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch > @@ -0,0 +1,29 @@ > +From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 > 2001 > +From: Alexandros Frantzis <alexandros.frantzis@collabora.com> > +Date: Mon, 14 Feb 2022 13:54:09 +0200 > +Subject: [PATCH] libmatrix: Add missing <utility> include > + > +Fixes compilation with GCC 12. > + > +Fixes #169 Forgot I had to sign the patch too: Signed-off-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > +--- > + Upstream commit: d1ca3f53c96dc8a4048b17dc16147a8fac782d4a > + > + src/libmatrix/program.h | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h > +index f95b470..1c9de08 100644 > +--- a/src/libmatrix/program.h > ++++ b/src/libmatrix/program.h > +@@ -15,6 +15,7 @@ > + #include <string> > + #include <vector> > + #include <map> > ++#include <utility> > + #include "mat.h" > + > + // Simple shader container. Abstracts all of the OpenGL bits, but > leaves > +-- > +2.35.1 > + > -- > 2.35.1 >
Paul, All, On 2022-10-31 10:40 +0000, Paul Cercueil spake thusly: > Le dim. 30 oct. 2022 à 23:04:10 +0000, Paul Cercueil <paul@crapouillou.net> > a écrit : > >Add a patch cherry-picked from upstream to fix the build with GCC 12. > > > >Upstream commit is d1ca3f53c96dc8a4048b17dc16147a8fac782d4a. > >I don't know if it fixes any autobuilder errors, I noticed the bug when > >building locally. > > > >Signed-off-by: Paul Cercueil <paul@crapouillou.net> > >--- > > ...ibmatrix-Add-missing-utility-include.patch | 29 +++++++++++++++++++ > > 1 file changed, 29 insertions(+) > > create mode 100644 > >package/glmark2/0002-libmatrix-Add-missing-utility-include.patch > > > >diff --git > >a/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch > >b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch > >new file mode 100644 > >index 0000000000..2a658393ae > >--- /dev/null > >+++ b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch > >@@ -0,0 +1,29 @@ > >+From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001 > >+From: Alexandros Frantzis <alexandros.frantzis@collabora.com> > >+Date: Mon, 14 Feb 2022 13:54:09 +0200 > >+Subject: [PATCH] libmatrix: Add missing <utility> include > >+ > >+Fixes compilation with GCC 12. > >+ > >+Fixes #169 > > Forgot I had to sign the patch too: > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Applied to master, thanks. Regards, Yann E. MORIN. > >+--- > >+ Upstream commit: d1ca3f53c96dc8a4048b17dc16147a8fac782d4a > >+ > >+ src/libmatrix/program.h | 1 + > >+ 1 file changed, 1 insertion(+) > >+ > >+diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h > >+index f95b470..1c9de08 100644 > >+--- a/src/libmatrix/program.h > >++++ b/src/libmatrix/program.h > >+@@ -15,6 +15,7 @@ > >+ #include <string> > >+ #include <vector> > >+ #include <map> > >++#include <utility> > >+ #include "mat.h" > >+ > >+ // Simple shader container. Abstracts all of the OpenGL bits, but > >leaves > >+-- > >+2.35.1 > >+ > >-- > >2.35.1 > > > > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch new file mode 100644 index 0000000000..2a658393ae --- /dev/null +++ b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch @@ -0,0 +1,29 @@ +From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001 +From: Alexandros Frantzis <alexandros.frantzis@collabora.com> +Date: Mon, 14 Feb 2022 13:54:09 +0200 +Subject: [PATCH] libmatrix: Add missing <utility> include + +Fixes compilation with GCC 12. + +Fixes #169 +--- + Upstream commit: d1ca3f53c96dc8a4048b17dc16147a8fac782d4a + + src/libmatrix/program.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h +index f95b470..1c9de08 100644 +--- a/src/libmatrix/program.h ++++ b/src/libmatrix/program.h +@@ -15,6 +15,7 @@ + #include <string> + #include <vector> + #include <map> ++#include <utility> + #include "mat.h" + + // Simple shader container. Abstracts all of the OpenGL bits, but leaves +-- +2.35.1 +
Add a patch cherry-picked from upstream to fix the build with GCC 12. Upstream commit is d1ca3f53c96dc8a4048b17dc16147a8fac782d4a. I don't know if it fixes any autobuilder errors, I noticed the bug when building locally. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- ...ibmatrix-Add-missing-utility-include.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/glmark2/0002-libmatrix-Add-missing-utility-include.patch