Conda: fix numpy detection for python 3.12.5 + numpy 2.0

rouault · Aug 11, 2024 · c9c4e09 · c9c4e09
1 parent 3ab5eae
commit c9c4e09
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/ci/travis/conda/install_python.sh.patch b/ci/travis/conda/install_python.sh.patch
@@ -0,0 +1,16 @@
+diff --git a/recipe/install_python.sh b/recipe/install_python.sh
+index 9cdaa2c..48d4ad2 100644
+--- a/recipe/install_python.sh
++++ b/recipe/install_python.sh
+@@ -10,8 +10,11 @@ rm -rf swig/python
+
+ Python_LOOKUP_VERSION=$($PYTHON -c "import sys; print(str(sys.version_info.major)+'.'+str(sys.version_info.minor)+'.'+str(sys.version_info.micro))")
+
++Python_NumPy_INCLUDE_DIR=$($PYTHON -c "import numpy; print(numpy.get_include())")
++
+ cmake "-UPython*" "-U*LATER_PLUGIN" \
+       -DPython_LOOKUP_VERSION=${Python_LOOKUP_VERSION} \
++      -DPython_NumPy_INCLUDE_DIR=${Python_NumPy_INCLUDE_DIR} \
+       -DBUILD_PYTHON_BINDINGS:BOOL=ON \
+       ${SRC_DIR} || (cat CMakeFiles/CMakeError.log;false)
+
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
@@ -20,6 +20,7 @@ git clone  https://github.com/conda-forge/gdal-feedstock.git
 cd gdal-feedstock
 
 patch -p1 < ../ci/travis/conda/meta.yaml.patch
+patch -p1 < ../ci/travis/conda/install_python.sh.patch
 
 cat > recipe/recipe_clobber.yaml <<EOL
 source: