From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 1/2] igt-gpu-tools: fix build with meson 0.60
Date: Wed, 15 Dec 2021 11:00:17 +0100 [thread overview]
Message-ID: <20211215100018.3352980-1-p.zabel@pengutronix.de> (raw)
Backport igt-gpu-tools commit 963917a35654 ("lib/meson.build: Fix
underscorify call") to fix build with recent Meson.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
...ib-meson.build-Fix-underscorify-call.patch | 36 +++++++++++++++++++
patches/igt-gpu-tools-1.26/series | 1 +
2 files changed, 37 insertions(+)
create mode 100644 patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
create mode 100644 patches/igt-gpu-tools-1.26/series
diff --git a/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
new file mode 100644
index 000000000000..51df2f0c40d6
--- /dev/null
+++ b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc82c29..297b0ad26ee5 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+
+ lib_intermediates = []
+ foreach f: lib_sources
+- name = f.underscorify(f)
++ name = f.underscorify()
+ lib = static_library('igt-' + name,
+ [ f, lib_version ],
+ include_directories: inc,
+--
+2.30.2
+
diff --git a/patches/igt-gpu-tools-1.26/series b/patches/igt-gpu-tools-1.26/series
new file mode 100644
index 000000000000..30537838e16d
--- /dev/null
+++ b/patches/igt-gpu-tools-1.26/series
@@ -0,0 +1 @@
+0001-lib-meson.build-Fix-underscorify-call.patch
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next reply other threads:[~2021-12-15 10:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 10:00 Philipp Zabel [this message]
2021-12-15 10:00 ` [ptxdist] [PATCH 2/2] meson: version bump 0.56.0 -> 0.60.2 Philipp Zabel
2021-12-17 7:51 ` Michael Olbrich
2021-12-17 8:55 ` Philipp Zabel
2022-01-31 8:35 ` Michael Olbrich
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-01-30 15:49 ` [ptxdist] [APPLIED] igt-gpu-tools: fix build with meson 0.60 Michael Olbrich
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=20211215100018.3352980-1-p.zabel@pengutronix.de \
--to=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