3 files changed, 64 insertions, 35 deletions

diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch
new file mode 100644
index 0000000000..e83576eb62
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch
@@ -0,0 +1,61 @@
+From 16dd09e6c79768a24f5a50ec5985e0b6fdf17f35 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Mon, 10 Mar 2025 13:52:11 +0100
+Subject: [PATCH] BLD: add option to specify numpy header location
+
+In some cases the numpy module might not be usable during build-time,
+especially when cross-compiling. (E.g. when compiling for arm32 on a
+x86-64 machine, the arm32 module is not usable at build time).
+
+This makes meson fail, as it isn't able to figure out the location of
+numpy headers.
+
+To allow an alternative way to find these headers, introduce a meson
+build option, where the location of the numpy headers can be specified.
+
+In case numpy module cannot be loaded for some reason to query the
+include folder location, fall back to the value of this meson option.
+
+Upstream-Status: Submitted [https://github.com/pandas-dev/pandas/pull/61095]
+
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ meson.options      |  1 +
+ pandas/meson.build | 13 ++++++++++---
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+ create mode 100644 meson.options
+
+--- /dev/null
++++ b/meson.options
+@@ -0,0 +1 @@
++option('numpy_inc_dir', type : 'string', description : 'The absolute path to the numpy headers')
+--- a/pandas/meson.build
++++ b/pandas/meson.build
+@@ -3,17 +3,24 @@ incdir_numpy = run_command(py,
+     '-c',
+     '''
+ import os
+-import numpy as np
++
++try:
++    import numpy as np
++    base_incdir = np.get_include()
++except Exception:
++    base_incdir = os.getenv('NUMPY_INC_DIR')
++
+ try:
+     # Check if include directory is inside the pandas dir
+     # e.g. a venv created inside the pandas dir
+     # If so, convert it to a relative path
+-    incdir = os.path.relpath(np.get_include())
++    incdir = os.path.relpath(base_incdir)
+ except Exception:
+-    incdir = np.get_include()
++    incdir = base_incdir
+ print(incdir)
+      '''
+   ],
++  env: {'NUMPY_INC_DIR': get_option('numpy_inc_dir')},
+   check: true
+ ).stdout().strip()
+ 
diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch
deleted file mode 100644
index b0ef8ce00c..0000000000
--- a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d81d95274d84ac51fc02e0fa91affc7f3cbefccb Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 24 Aug 2024 10:21:43 -0700
-Subject: [PATCH] pyproject.toml: Downgrade numpy version needs to 1.x
-
-Drop it when numpy is upgraded to 2.x or newer in core
-
-Upstream-Status: Inappropriate [OE workaround]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 5158d60..d3daa78 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -8,7 +8,7 @@ requires = [
-     "Cython>=3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
-     # Force numpy higher than 2.0rc1, so that built wheels are compatible
-     # with both numpy 1 and 2
--    "numpy>=2.0.0rc1",
-+    "numpy>=1.24.0",
-     "versioneer[toml]"
- ]
- 
diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch
index f60f43a5b0..950f25303f 100644
--- a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch
+++ b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch
@@ -14,8 +14,6 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
  pyproject.toml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/pyproject.toml b/pyproject.toml
-index db9f055799..5158d60f59 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
 @@ -2,10 +2,10 @@
@@ -27,11 +25,8 @@ index db9f055799..5158d60f59 100644
 +    "meson-python>=0.13.1",
 +    "meson>=1.2.1",
      "wheel",
--    "Cython==3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
+-    "Cython~=3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
 +    "Cython>=3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
-     # Force numpy higher than 2.0rc1, so that built wheels are compatible
+     # Force numpy higher than 2.0, so that built wheels are compatible
      # with both numpy 1 and 2
-     "numpy>=2.0.0rc1",
--- 
-2.39.2
-
+     "numpy>=2.0",