summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBuildbot system user <buildbot@medusa>2020-03-25 13:26:01 +0000
committerBuildbot system user <buildbot@medusa>2020-03-25 13:26:01 +0000
commitaf7a186592cb2ffb29acb164530ef5f7bfcf0d3f (patch)
tree038d2a390940ecf68f64c5f3fe64f22dd7ae4e57
parent6aa84f52f206a42a0869aeb92bdcb0662dfe555b (diff)
Add mesa patch
-rw-r--r--patches/mesa-mesa/0001-Fix-util-process-test-on-Cygwin.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/mesa-mesa/0001-Fix-util-process-test-on-Cygwin.patch b/patches/mesa-mesa/0001-Fix-util-process-test-on-Cygwin.patch
new file mode 100644
index 0000000..e03b8af
--- /dev/null
+++ b/patches/mesa-mesa/0001-Fix-util-process-test-on-Cygwin.patch
@@ -0,0 +1,31 @@
+From d1ea57acca6f088d7b7931b93108659e8611fc51 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 25 Mar 2020 13:22:30 +0000
+Subject: [PATCH] Fix util/process test on Cygwin
+
+It seems meson returns the filename with extension for full_path(), even
+though Cygwin does it's best to pretend the file doesn't have that
+extension.
+---
+ src/util/process_test.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/util/process_test.c b/src/util/process_test.c
+index 708c2766eb9..5a9fc2ef85c 100644
+--- a/src/util/process_test.c
++++ b/src/util/process_test.c
+@@ -70,6 +70,11 @@ test_util_get_process_exec_path (void)
+ error = true;
+ return;
+ }
++#ifdef __CYGWIN__
++ int i = strlen(build_path) - 4;
++ if ((i > 0) && (strcmp(&build_path[i], ".exe") == 0))
++ build_path[i] = 0;
++#endif
+ expect_equal_str(build_path, path, "util_get_process_name");
+ }
+
+--
+2.21.0
+