wheels: try remove s2geography patches

benbovy · Dec 2, 2024 · 00256db · 00256db
1 parent e41a088
commit 00256db
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ci/install_3rdparty.cmd b/ci/install_3rdparty.cmd
@@ -89,9 +89,9 @@ curl -o s2geography.tar.gz -L https://github.com/paleolimbot/s2geography/archive
 tar -xf s2geography.tar.gz -C %SRC_DIR%
 
 rem TODO: remove when fixed in s2geography
-cd %SRC_DIR%/s2geography-%S2GEOGRAPHY_VERSION%
-patch -i %PROJECT_DIR%\ci\s2geography-add-openssl-as-requirement.patch
-patch -i %PROJECT_DIR%\ci\s2geography-add-include-dir.patch
+rem cd %SRC_DIR%/s2geography-%S2GEOGRAPHY_VERSION%
+rem patch -i %PROJECT_DIR%\ci\s2geography-add-openssl-as-requirement.patch
+rem patch -i %PROJECT_DIR%\ci\s2geography-add-include-dir.patch
 
 cmake -GNinja ^
     -S %SRC_DIR%/s2geography-%S2GEOGRAPHY_VERSION% ^

diff --git a/ci/install_3rdparty.sh b/ci/install_3rdparty.sh
@@ -102,13 +102,13 @@ build_install_dependencies(){
 
     # TODO: remove when fixed in s2geography
     cd $SRC_DIR/s2geography-$S2GEOGRAPHY_VERSION
-    if [ "$(uname)" == "Darwin" ]; then
-        patch -p1 < $PROJECT_DIR/ci/s2geography-add-openssl-as-requirement.patch
-        patch -p1 < $PROJECT_DIR/ci/s2geography-add-include-dir.patch
-    else
-        patch -p1 < /project/ci/s2geography-add-openssl-as-requirement.patch
-        patch -p1 < /project/ci/s2geography-add-include-dir.patch
-    fi
+    # if [ "$(uname)" == "Darwin" ]; then
+    #     patch -p1 < $PROJECT_DIR/ci/s2geography-add-openssl-as-requirement.patch
+    #     patch -p1 < $PROJECT_DIR/ci/s2geography-add-include-dir.patch
+    # else
+    #     patch -p1 < /project/ci/s2geography-add-openssl-as-requirement.patch
+    #     patch -p1 < /project/ci/s2geography-add-include-dir.patch
+    # fi
 
     cmake -S $SRC_DIR/s2geography-$S2GEOGRAPHY_VERSION -B $S2GEOGRAPHY_BUILD_DIR \
         -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \