Skip to content

Commit

Permalink
c-deps/proj: bump PROJ to compile on more systems
Browse files Browse the repository at this point in the history
CMake is broken for the value of `PTHREAD_MUTEX_RECURSIVE` on certain
operating systems. To rectify this, we've patched PROJ at version 4.9.3
at `cc4a178` with a fix. We'll be using the CRDB fork of PROJ for the
meantime to fix this for now.

Release note: None
  • Loading branch information
otan committed Jun 1, 2020
1 parent 95916e4 commit a6f8e44
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
url = https://github.com/libgeos/geos.git
[submodule "c-deps/proj"]
path = c-deps/proj
url = https://github.com/OSGeo/PROJ.git
url = https://github.com/cockroachdb/PROJ.git
2 changes: 1 addition & 1 deletion c-deps/proj
Submodule proj updated 1 files
+10 −3 CMakeLists.txt
2 changes: 1 addition & 1 deletion c-deps/proj-rebuild
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bump the version below when changing geos configure flags. Search for "BUILD
ARTIFACT CACHING" in build/common.mk for rationale.

1
2

0 comments on commit a6f8e44

Please sign in to comment.