From 82de1f3c2ff1ef7b97799b67ec50b4ff7bd93d47 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 6 Nov 2023 22:55:25 +0100 Subject: [PATCH] CI Conda: add patch to enable OGR_REGISTER_DRIVER_ARROW/PARQUET_FOR_LATER_PLUGIN --- ci/travis/conda/bld.bat.patch | 13 +++++++++++++ ci/travis/conda/build.sh.patch | 13 +++++++++++++ ci/travis/conda/setup.sh | 6 ++++++ 3 files changed, 32 insertions(+) create mode 100644 ci/travis/conda/bld.bat.patch create mode 100644 ci/travis/conda/build.sh.patch diff --git a/ci/travis/conda/bld.bat.patch b/ci/travis/conda/bld.bat.patch new file mode 100644 index 000000000000..7bb286166552 --- /dev/null +++ b/ci/travis/conda/bld.bat.patch @@ -0,0 +1,13 @@ +diff --git a/recipe/bld.bat b/recipe/bld.bat +index b6616ae..b98a480 100644 +--- a/recipe/bld.bat ++++ b/recipe/bld.bat +@@ -32,6 +32,8 @@ cmake -G "Ninja" ^ + -DGDAL_USE_PARQUET=OFF ^ + -DGDAL_USE_ARROW=OFF ^ + -DGDAL_USE_ARROWDATASET=OFF ^ ++ -DOGR_REGISTER_DRIVER_ARROW_FOR_LATER_PLUGIN=ON ^ ++ -DOGR_REGISTER_DRIVER_PARQUET_FOR_LATER_PLUGIN=ON ^ + "%SRC_DIR%" + + if errorlevel 1 exit /b 1 diff --git a/ci/travis/conda/build.sh.patch b/ci/travis/conda/build.sh.patch new file mode 100644 index 000000000000..373b5103c2ff --- /dev/null +++ b/ci/travis/conda/build.sh.patch @@ -0,0 +1,13 @@ +diff --git a/recipe/build.sh b/recipe/build.sh +index a3474a2..249dc89 100644 +--- a/recipe/build.sh ++++ b/recipe/build.sh +@@ -23,6 +23,8 @@ cmake -G "Unix Makefiles" \ + -DGDAL_USE_PARQUET=OFF \ + -DGDAL_USE_ARROW=OFF \ + -DGDAL_USE_ARROWDATASET=OFF \ ++ -DOGR_REGISTER_DRIVER_ARROW_FOR_LATER_PLUGIN=ON \ ++ -DOGR_REGISTER_DRIVER_PARQUET_FOR_LATER_PLUGIN=ON \ + -DGDAL_ENABLE_HDF5_GLOBAL_LOCK:BOOL=ON \ + -DBUILD_PYTHON_BINDINGS:BOOL=OFF \ + -DBUILD_JAVA_BINDINGS:BOOL=OFF \ diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh index 6c749fb0cf98..d24f43e597fc 100755 --- a/ci/travis/conda/setup.sh +++ b/ci/travis/conda/setup.sh @@ -15,6 +15,12 @@ conda install -c conda-forge conda-build -y git clone https://github.com/conda-forge/gdal-feedstock.git cd gdal-feedstock + +# Set -DOGR_REGISTER_DRIVER_ARROW_FOR_LATER_PLUGIN=ON and -DOGR_REGISTER_DRIVER_PARQUET_FOR_LATER_PLUGIN=ON +# To be dropped once that's upstreamed in conda-forge/gdal-feedstock.git +patch -p1 < ../ci/travis/conda/build.sh.patch +patch -p1 --binary < ../ci/travis/conda/bld.bat.patch + cat > recipe/recipe_clobber.yaml <