From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] glmark2: backport GCC 12 build fix
Date: Wed, 19 Oct 2022 07:41:03 +0200 [thread overview]
Message-ID: <20221019054103.401546-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220930093829.3758764-1-p.zabel@pengutronix.de>
Thanks, applied as d0a6370b0425ca607c9f4df28a981541a6ad82ef.
Michael
[sent from post-receive hook]
On Wed, 19 Oct 2022 07:41:03 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Upstream commit d1ca3f53c96d ("libmatrix: Add missing <utility>
> include") fixes building with GCC 12.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220930093829.3758764-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch b/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
> new file mode 100644
> index 000000000000..ead4fb5f817c
> --- /dev/null
> +++ b/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
> @@ -0,0 +1,26 @@
> +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
> +
> +[p.zabel@pengutronix.de: Back-ported to 2021.12]
> +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> +---
> + src/libmatrix/program.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h
> +index f95b470cfae0..1c9de08b749a 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
> diff --git a/patches/glmark2-2021.12/series b/patches/glmark2-2021.12/series
> new file mode 100644
> index 000000000000..d9bbb4faacb3
> --- /dev/null
> +++ b/patches/glmark2-2021.12/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-libmatrix-Add-missing-utility-include.patch
> +# ce7ebc58a400e5455959996697f9022b - git-ptx-patches magic
prev parent reply other threads:[~2022-10-19 5:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 9:38 [ptxdist] [PATCH] " Philipp Zabel
2022-10-19 5:41 ` Michael Olbrich [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=20221019054103.401546-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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