python-numpy/update-meson-1_5_2.patch

36 lines
1.2 KiB
Diff

From bc6023c95fefa332f9510a527f605b869be3aefc Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Mon, 14 Oct 2024 13:59:03 +0200
Subject: [PATCH 1/2] BLD: update vendored Meson to 1.5.2
---
vendored-meson/meson | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vendored-meson/meson b/vendored-meson/meson
index 6f88e485f27b..11dffde9a67f 160000
--- a/vendored-meson/meson
+++ b/vendored-meson/meson
@@ -1 +1 @@
-Subproject commit 6f88e485f27bb0a41d31638f0c55055362e0b1ac
+Subproject commit 11dffde9a67fe926b262dc33fff3d68f9281b159
From 1171ae269bf3a0adc1ca2e99cd691617686fa648 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Tue, 15 Oct 2024 10:39:20 +0200
Subject: [PATCH 2/2] BLD: update vendored Meson to include a fix for AIX
Will be included upstream in Meson 1.6.0; cherry-picked in
https://github.com/numpy/meson/pull/17.
---
vendored-meson/meson | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vendored-meson/meson b/vendored-meson/meson
index 11dffde9a67f..0d93515fb826 160000
--- a/vendored-meson/meson
+++ b/vendored-meson/meson
@@ -1 +1 @@
-Subproject commit 11dffde9a67fe926b262dc33fff3d68f9281b159
+Subproject commit 0d93515fb826440d19707eee47fd92655fe2f166