geos: update GEOS to 3.11

All test changes are due to a change in Polygon output ordering, or GEOS outputting a different yet valid result. Note we stop supporting windows as a result. Release note (general change): Spatial libraries from Cockroach now rely on GEOS 3.11 instead of GEOS 3.8. Epic: none Release note (general change): Stop distributing `libgeos` for (experimental) Windows build. Users can instead install GEOS directly from source: https://libgeos.org/usage/download/.
cockroachdb · Jul 14, 2023 · 8b7a810 · 8b7a810
1 parent 2b6857a
commit 8b7a810
Show file tree

Hide file tree

Showing 23 changed files with 598 additions and 532 deletions.
diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -1165,23 +1165,22 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/public-bazel-artifacts/bazel/rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d",
     "https://storage.googleapis.com/public-bazel-artifacts/bazel/rules_python-0.1.0.tar.gz": "b6d46438523a3ec0f3cead544190ee13223a52f6a6765a29eae7b7cc24cc83a0",
     "https://storage.googleapis.com/public-bazel-artifacts/bazel/sqllogictest-96138842571462ed9a697bff590828d8f6356a2f.tar.gz": "f7e0d659fbefb65f32d4c5d146cba4c73c43e0e96f9b217a756c82be17451f97",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libgeos_foreign.linux.20230105-170607.tar.gz": "ba5abd50a78c37460b3bf71e511c27c9ccee47b62f39fb95e2f0484ca81e7483",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libgeos_foreign.linuxarm.20230105-170607.tar.gz": "0817ec0f0b6487c8204e7456025ad9bf2aad644e67842d2089c79e8eed0e64ea",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libgeos_foreign.macos.20230105-170607.tar.gz": "10bcfd316c047afe00bb6d5ad519cbd2b4c8b9d35ca197fed771f6d3fbbb7b66",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libgeos_foreign.macosarm.20230105-170607.tar.gz": "1db3ec640b3992a2dd693df9bf5c52c55b43f387399ca885f1692fbbfa6baf88",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libgeos_foreign.windows.20230105-170607.tar.gz": "221408632feebb02f0793900aea1ed477fbb51cf8b278c4d6eea61f38870ffb4",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libjemalloc_foreign.linux.20230105-170607.tar.gz": "fc49f5f31603c20743eb6278497777d18681c7ad51a0ed32fe246e7d1c55f12e",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libjemalloc_foreign.linuxarm.20230105-170607.tar.gz": "b6c969eb34369e5964f3d8d41efe4d0d19a1dd298ed8f217cfbaa2718e77dc9b",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libjemalloc_foreign.macos.20230105-170607.tar.gz": "9f786e0e8200ce8f55f0328c283ddbbb77a5fcd03437319335e0fddf9fb27a66",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libjemalloc_foreign.macosarm.20230105-170607.tar.gz": "06f046643bbcbf071108c4dc21f5bc9b843f597871d88f95760eda63d4ade822",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libjemalloc_foreign.windows.20230105-170607.tar.gz": "1f5ca83705c961b89745fc4f80b8363995f973800be210a5a5fd423d6bd17a22",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libkrb5_foreign.linux.20230105-170607.tar.gz": "0ab2d7116f5c52c7f035e492b8899f9e632450f4c0c1db81b9da45bb40317950",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libkrb5_foreign.linuxarm.20230105-170607.tar.gz": "624631c7c8e79ec97074ab7bf2c19102c82a2c897fa3465a97c21809a3c35579",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libproj_foreign.linux.20230105-170607.tar.gz": "bfb537ee11fb1442d77e26d273c42a06366b2687e1936cca166f4fd25ccd42dc",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libproj_foreign.linuxarm.20230105-170607.tar.gz": "e9fce505246165c34c4cb00b67076cae2319c5203db11a378a76c17cea204722",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libproj_foreign.macos.20230105-170607.tar.gz": "7706dcc20f083f621ba891eb82864e980ae352f34add33753100085d12ab91ec",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libproj_foreign.macosarm.20230105-170607.tar.gz": "1ab617eb51b017d27d71ba08a065b6a08ef5410e9aa5554669196b7cf28214c1",
-    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230105-170607/libproj_foreign.windows.20230105-170607.tar.gz": "b819b17740b2a3418d62d2f6db8b245094458180e1e5e301e9f0f4257696fef5",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libgeos_foreign.linux.20230713-184622.tar.gz": "41742e88359d55a8d45207e5628e28cd7ea7689b804bbb6ea5950e26bc7da070",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libgeos_foreign.linuxarm.20230713-184622.tar.gz": "93d19ab0c8506c0d00284e0e393ff8703a0bbf7ed3103f242e29ffdef20bbdd8",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libgeos_foreign.macos.20230713-184622.tar.gz": "3fa2c5a668a097cc6ff75ed6b8ff7c2a67364f9f73fbd7f930dcbc880dcf398d",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libgeos_foreign.macosarm.20230713-184622.tar.gz": "0eccaa5745f0228bb4be02ef20970078861a3652ef6ff91b436f44dd7fbc7f65",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.linux.20230713-184622.tar.gz": "9bac2dd86a77e47b2891649cfe8b14f8885ccd7d08ab1283eca7889bba65a576",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.linuxarm.20230713-184622.tar.gz": "124c29566233005309becd58c5deaa80c1d961a9fb18bba0807865f8f1ee07af",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.macos.20230713-184622.tar.gz": "aad0b1ec36d37d5f91d22936eff0d0676a35bb5cb140949a9b85d734df64ed78",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.macosarm.20230713-184622.tar.gz": "4494582bd2909440124ed46d5fb84142742706c5edc968ee3ff6be0f62b4e2ad",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.windows.20230713-184622.tar.gz": "cab948999d3f16e820fe1c58b85164718903b6a55a3634edf6564645b057ee71",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libkrb5_foreign.linux.20230713-184622.tar.gz": "fcc88b98b93109c70edf2180f969e2164c9c25bdffcebc647116b47b80114863",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libkrb5_foreign.linuxarm.20230713-184622.tar.gz": "1fd3e8a24ee8345986f705c7bae9977a3c574c43a62f17025959d041081a1678",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.linux.20230713-184622.tar.gz": "a36e373c04817f322dc1482a192a0911a41855ccc30f0c356e76133db4333aa4",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.linuxarm.20230713-184622.tar.gz": "b97df26615a592434f782bcd4f5faacbbb4f939da78004e447764b66a445d942",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.macos.20230713-184622.tar.gz": "3235279411c84fa03e5b19ac8b28756dabf54535ea67a98c0e44f73197e20bea",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.macosarm.20230713-184622.tar.gz": "eb8830c18b5d906d9951934ae9b8e2bf99e2d4d0d74897dff6dd4f35c50aef54",
+    "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.windows.20230713-184622.tar.gz": "ca1335c8182a2562ea43e0803d4ca437d45fb95462896752219f19cb302814eb",
     "https://storage.googleapis.com/public-bazel-artifacts/go/20230614-165357/go1.19.10.darwin-amd64.tar.gz": "48361d76271f9a725942bdc17012ae9fef72359f7b0aa303deb1098e05ef818c",
     "https://storage.googleapis.com/public-bazel-artifacts/go/20230614-165357/go1.19.10.darwin-arm64.tar.gz": "7cc8ab7e8e1225b57f44ec8fb26bce70ddea8e076dfdf118ed63fef0c9ff19fb",
     "https://storage.googleapis.com/public-bazel-artifacts/go/20230614-165357/go1.19.10.freebsd-amd64.tar.gz": "0d22265662eaa9b8136223f8ab68f5c06c58c6a6311748fb810e830ebd17cbe2",

diff --git a/build/teamcity/cockroach/ci/builds/build_impl.sh b/build/teamcity/cockroach/ci/builds/build_impl.sh
@@ -27,10 +27,13 @@ then
 fi
 
 EXTRA_ARGS=
+# GEOS does not compile on windows.
+GEOS_TARGET=//c-deps:libgeos
 
 if [ "$CONFIG" == "crosswindows" ]
 then
    EXTRA_ARGS=--enable_runfiles
+   GEOS_TARGET=
 fi
 
 bazel build //pkg/cmd/bazci --config=ci
@@ -39,7 +42,7 @@ BAZEL_BIN=$(bazel info bazel-bin --config=ci)
 		       --config "$CONFIG" --config ci $EXTRA_ARGS \
 		       //pkg/cmd/cockroach-short //pkg/cmd/cockroach \
 		       //pkg/cmd/cockroach-sql \
-		       //pkg/cmd/cockroach-oss //c-deps:libgeos $EXTRA_TARGETS
+		       //pkg/cmd/cockroach-oss $GEOS_TARGET $EXTRA_TARGETS
 
 if [[ $CONFIG == "crosslinuxfips" ]]; then
     for bin in cockroach cockroach-short cockroach-sql cockroach-oss; do

diff --git a/c-deps/BUILD.bazel b/c-deps/BUILD.bazel
@@ -122,17 +122,26 @@ cmake(
             "CMAKE_C_FLAGS": "-fPIC",
             "CMAKE_CXX_FLAGS": "-fPIC",
             "CMAKE_SYSTEM_NAME": "Windows",
+            "BUILD_GEOSOP": "OFF",
+            "BUILD_TESTING": "OFF",
+            "GEOS_BUILD_DEVELOPER": "OFF",
         },
         "@io_bazel_rules_go//go/platform:darwin": {
             "CMAKE_BUILD_TYPE": "Release",
             "CMAKE_C_FLAGS": "-fPIC",
             "CMAKE_CXX_FLAGS": "-fPIC",
             "CMAKE_SYSTEM_NAME": "Darwin",
+            "BUILD_GEOSOP": "OFF",
+            "BUILD_TESTING": "OFF",
+            "GEOS_BUILD_DEVELOPER": "OFF",
         },
         "//conditions:default": {
             "CMAKE_BUILD_TYPE": "Release",
             "CMAKE_C_FLAGS": "-fPIC",
             "CMAKE_CXX_FLAGS": "-fPIC",
+            "BUILD_GEOSOP": "OFF",
+            "BUILD_TESTING": "OFF",
+            "GEOS_BUILD_DEVELOPER": "OFF",
         },
     }),
     data = select({
@@ -181,21 +190,21 @@ cmake(
     }),
     postfix_script = "mkdir -p libgeos/lib\n" + select({
         "//build/toolchains:is_cross_macos": (
-            "cp -L lib/libgeos.3.8.1.dylib $INSTALLDIR/lib/libgeos.dylib\n" +
+            "cp -L lib/libgeos.3.11.2.dylib $INSTALLDIR/lib/libgeos.dylib\n" +
             "PREFIX=$($OTOOL -D $INSTALLDIR/lib/libgeos_c.dylib | tail -n1 | rev | cut -d/ -f2- | rev)\n" +
-            "$CMAKE_INSTALL_NAME_TOOL -id @rpath/libgeos.3.8.1.dylib $INSTALLDIR/lib/libgeos.dylib\n" +
+            "$CMAKE_INSTALL_NAME_TOOL -id @rpath/libgeos.3.11.2.dylib $INSTALLDIR/lib/libgeos.dylib\n" +
             "$CMAKE_INSTALL_NAME_TOOL -id @rpath/libgeos_c.1.dylib $INSTALLDIR/lib/libgeos_c.dylib\n" +
-            "$CMAKE_INSTALL_NAME_TOOL -change $PREFIX/libgeos.3.8.1.dylib @rpath/libgeos.3.8.1.dylib $INSTALLDIR/lib/libgeos_c.dylib\n"
+            "$CMAKE_INSTALL_NAME_TOOL -change $PREFIX/libgeos.3.11.2.dylib @rpath/libgeos.3.11.2.dylib $INSTALLDIR/lib/libgeos_c.dylib\n"
         ),
-        "@io_bazel_rules_go//go/platform:darwin": "cp -L lib/libgeos.3.8.1.dylib $INSTALLDIR/lib/libgeos.dylib",
+        "@io_bazel_rules_go//go/platform:darwin": "cp -L lib/libgeos.3.11.2.dylib $INSTALLDIR/lib/libgeos.dylib",
         "@io_bazel_rules_go//go/platform:windows": "",
         "//build/toolchains:is_cross_linux": (
-            "cp -L lib/libgeos.so.3.8.1 $INSTALLDIR/lib/libgeos.so\n" +
+            "cp -L lib/libgeos.so.3.11.2 $INSTALLDIR/lib/libgeos.so\n" +
             "patchelf --set-rpath /usr/local/lib/cockroach/ $INSTALLDIR/lib/libgeos_c.so\n" +
             "patchelf --set-soname libgeos.so $INSTALLDIR/lib/libgeos.so\n" +
-            "patchelf --replace-needed libgeos.so.3.8.1 libgeos.so $INSTALLDIR/lib/libgeos_c.so\n"
+            "patchelf --replace-needed libgeos.so.3.11.2 libgeos.so $INSTALLDIR/lib/libgeos_c.so\n"
         ),
-        "//conditions:default": "cp -L lib/libgeos.so.3.8.1 $INSTALLDIR/lib/libgeos.so",
+        "//conditions:default": "cp -L lib/libgeos.so.3.11.2 $INSTALLDIR/lib/libgeos.so",
     }),
     targets = ["geos_c"],
     visibility = ["//visibility:public"],

diff --git a/c-deps/REPOSITORIES.bzl b/c-deps/REPOSITORIES.bzl
@@ -39,85 +39,80 @@ def c_deps():
     archived_cdep_repository(
         lib = "libgeos",
         config = "linux",
-        sha256 = "ba5abd50a78c37460b3bf71e511c27c9ccee47b62f39fb95e2f0484ca81e7483",
+        sha256 = "41742e88359d55a8d45207e5628e28cd7ea7689b804bbb6ea5950e26bc7da070",
     )
     archived_cdep_repository(
         lib = "libjemalloc",
         config = "linux",
-        sha256 = "fc49f5f31603c20743eb6278497777d18681c7ad51a0ed32fe246e7d1c55f12e",
+        sha256 = "9bac2dd86a77e47b2891649cfe8b14f8885ccd7d08ab1283eca7889bba65a576",
     )
     archived_cdep_repository(
         lib = "libkrb5",
         config = "linux",
-        sha256 = "0ab2d7116f5c52c7f035e492b8899f9e632450f4c0c1db81b9da45bb40317950",
+        sha256 = "fcc88b98b93109c70edf2180f969e2164c9c25bdffcebc647116b47b80114863",
     )
     archived_cdep_repository(
         lib = "libproj",
         config = "linux",
-        sha256 = "bfb537ee11fb1442d77e26d273c42a06366b2687e1936cca166f4fd25ccd42dc",
+        sha256 = "a36e373c04817f322dc1482a192a0911a41855ccc30f0c356e76133db4333aa4",
     )
     archived_cdep_repository(
         lib = "libgeos",
         config = "linuxarm",
-        sha256 = "0817ec0f0b6487c8204e7456025ad9bf2aad644e67842d2089c79e8eed0e64ea",
+        sha256 = "93d19ab0c8506c0d00284e0e393ff8703a0bbf7ed3103f242e29ffdef20bbdd8",
     )
     archived_cdep_repository(
         lib = "libjemalloc",
         config = "linuxarm",
-        sha256 = "b6c969eb34369e5964f3d8d41efe4d0d19a1dd298ed8f217cfbaa2718e77dc9b",
+        sha256 = "124c29566233005309becd58c5deaa80c1d961a9fb18bba0807865f8f1ee07af",
     )
     archived_cdep_repository(
         lib = "libkrb5",
         config = "linuxarm",
-        sha256 = "624631c7c8e79ec97074ab7bf2c19102c82a2c897fa3465a97c21809a3c35579",
+        sha256 = "1fd3e8a24ee8345986f705c7bae9977a3c574c43a62f17025959d041081a1678",
     )
     archived_cdep_repository(
         lib = "libproj",
         config = "linuxarm",
-        sha256 = "e9fce505246165c34c4cb00b67076cae2319c5203db11a378a76c17cea204722",
+        sha256 = "b97df26615a592434f782bcd4f5faacbbb4f939da78004e447764b66a445d942",
     )
     archived_cdep_repository(
         lib = "libgeos",
         config = "macos",
-        sha256 = "10bcfd316c047afe00bb6d5ad519cbd2b4c8b9d35ca197fed771f6d3fbbb7b66",
+        sha256 = "3fa2c5a668a097cc6ff75ed6b8ff7c2a67364f9f73fbd7f930dcbc880dcf398d",
     )
     archived_cdep_repository(
         lib = "libjemalloc",
         config = "macos",
-        sha256 = "9f786e0e8200ce8f55f0328c283ddbbb77a5fcd03437319335e0fddf9fb27a66",
+        sha256 = "aad0b1ec36d37d5f91d22936eff0d0676a35bb5cb140949a9b85d734df64ed78",
     )
     archived_cdep_repository(
         lib = "libproj",
         config = "macos",
-        sha256 = "7706dcc20f083f621ba891eb82864e980ae352f34add33753100085d12ab91ec",
+        sha256 = "3235279411c84fa03e5b19ac8b28756dabf54535ea67a98c0e44f73197e20bea",
     )
     archived_cdep_repository(
         lib = "libgeos",
         config = "macosarm",
-        sha256 = "1db3ec640b3992a2dd693df9bf5c52c55b43f387399ca885f1692fbbfa6baf88",
+        sha256 = "0eccaa5745f0228bb4be02ef20970078861a3652ef6ff91b436f44dd7fbc7f65",
     )
     archived_cdep_repository(
         lib = "libjemalloc",
         config = "macosarm",
-        sha256 = "06f046643bbcbf071108c4dc21f5bc9b843f597871d88f95760eda63d4ade822",
+        sha256 = "4494582bd2909440124ed46d5fb84142742706c5edc968ee3ff6be0f62b4e2ad",
     )
     archived_cdep_repository(
         lib = "libproj",
         config = "macosarm",
-        sha256 = "1ab617eb51b017d27d71ba08a065b6a08ef5410e9aa5554669196b7cf28214c1",
-    )
-    archived_cdep_repository(
-        lib = "libgeos",
-        config = "windows",
-        sha256 = "221408632feebb02f0793900aea1ed477fbb51cf8b278c4d6eea61f38870ffb4",
+        sha256 = "eb8830c18b5d906d9951934ae9b8e2bf99e2d4d0d74897dff6dd4f35c50aef54",
     )
     archived_cdep_repository(
         lib = "libjemalloc",
         config = "windows",
-        sha256 = "1f5ca83705c961b89745fc4f80b8363995f973800be210a5a5fd423d6bd17a22",
+        sha256 = "cab948999d3f16e820fe1c58b85164718903b6a55a3634edf6564645b057ee71",
     )
     archived_cdep_repository(
         lib = "libproj",
         config = "windows",
-        sha256 = "b819b17740b2a3418d62d2f6db8b245094458180e1e5e301e9f0f4257696fef5",
+        sha256 = "ca1335c8182a2562ea43e0803d4ca437d45fb95462896752219f19cb302814eb",
     )
diff --git a/c-deps/archived.bzl b/c-deps/archived.bzl
@@ -4,7 +4,7 @@ load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
 
 # NB: URL_TMPL and LOC are used by generate-distdir. Don't change the format or
 # name of these definitions unless you update generate-distdir accordingly.
-LOC = "20230105-170607"
+LOC = "20230713-184622"
 URL_TMPL = "https://storage.googleapis.com/public-bazel-artifacts/c-deps/{loc}/{lib}_foreign.{config}.{loc}.tar.gz"
 
 # NB: When we link with the krb5 libraries, we want the linker to see them in
@@ -92,13 +92,20 @@ _archived_cdep = rule(
 )
 
 def archived_cdeps():
-    for lib in ["libgeos", "libjemalloc", "libproj"]:
+    for lib in ["libjemalloc", "libproj"]:
         for config in ["linux", "linuxarm", "macos", "macosarm", "windows"]:
             _archived_cdep(
                 name = "archived_cdep_{}_{}".format(lib, config),
                 headers = "@archived_cdep_{}_{}//:headers".format(lib, config),
                 libs = "@archived_cdep_{}_{}//:libs".format(lib, config),
             )
+    for lib in ["libgeos"]:
+        for config in ["linux", "linuxarm", "macos", "macosarm"]:  # No libgeos for windows.
+            _archived_cdep(
+                name = "archived_cdep_{}_{}".format(lib, config),
+                headers = "@archived_cdep_{}_{}//:headers".format(lib, config),
+                libs = "@archived_cdep_{}_{}//:libs".format(lib, config),
+            )
     for config in ["linux", "linuxarm"]:
         _archived_cdep(
             name = "archived_cdep_libkrb5_{}".format(config),
@@ -143,7 +150,8 @@ def cdep_alias(lib):
     if lib != "libkrb5":
         actual["//build/toolchains:is_darwin_amd64_no_force_build_cdeps"] = ":archived_cdep_{}_macos".format(lib)
         actual["//build/toolchains:is_darwin_arm64_no_force_build_cdeps"] = ":archived_cdep_{}_macosarm".format(lib)
-        actual["//build/toolchains:is_windows_amd64_no_force_build_cdeps"] = ":archived_cdep_{}_windows".format(lib)
+        if lib != "libgeos":
+            actual["//build/toolchains:is_windows_amd64_no_force_build_cdeps"] = ":archived_cdep_{}_windows".format(lib)
     native.alias(
         name = lib,
         actual = select(actual),

diff --git a/c-deps/buildcdeps.sh b/c-deps/buildcdeps.sh
@@ -11,7 +11,10 @@ bundle() {
 }
 
 for CONFIG in $CONFIGS; do
-    TARGETS="libgeos libproj libjemalloc"
+    TARGETS="libproj libjemalloc"
+    if [[ $CONFIG != windows ]]; then
+        TARGETS="$TARGETS libgeos"
+    fi
     if [[ $CONFIG == linux* ]]; then
         TARGETS="$TARGETS libkrb5"
     fi

diff --git a/c-deps/geos b/c-deps/geos