From 9fa2cfadd98f5c2450a887bedea5a9dbaee411e4 Mon Sep 17 00:00:00 2001
From: Oliver Tan <otan@cockroachlabs.com>
Date: Thu, 1 Oct 2020 12:24:02 -0700
Subject: [PATCH] build: correct ELF info for libgeos

Looks like cross compiling with rpath does not work, so install patchelf
and use them on the given .so files such that dlopen works using the
regular pattern.

Release note (general change, bug fix): Fixed the rpath and so names of
libgeos.so and libgeos_c.so such that a dlopen to libgeos.so is not
needed.
---
 Makefile                 | 12 ++++++++++++
 build/builder.sh         |  2 +-
 build/builder/Dockerfile |  1 +
 c-deps/geos-rebuild      |  2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0aa22b817916..081b3ddd0bd1 100644
--- a/Makefile
+++ b/Makefile
@@ -427,6 +427,7 @@ endif
 
 target-is-windows := $(findstring w64,$(TARGET_TRIPLE))
 target-is-macos := $(findstring darwin,$(TARGET_TRIPLE))
+target-is-linux := $(findstring linux,$(TARGET_TRIPLE))
 
 # CMAKE_TARGET_MESSAGES=OFF prevents CMake from printing progress messages
 # whenever a target is fully built to prevent spammy output from make when
@@ -778,6 +779,9 @@ ifdef is-cross-compile
 ifdef target-is-macos
 geos_require_install_name_tool := 1
 endif
+ifdef target-is-linux
+geos_require_patchelf := 1
+endif
 endif
 
 # For dlopen to work with OSX from any location, we need the @rpath directory prefix.
@@ -790,6 +794,14 @@ $(LIBGEOS): libgeos_inner .ALWAYS_REBUILD
 	$(TARGET_TRIPLE)-install_name_tool -id @rpath/libgeos.3.8.1.dylib lib/libgeos.dylib
 	$(TARGET_TRIPLE)-install_name_tool -id @rpath/libgeos_c.1.dylib lib/libgeos_c.dylib
 	$(TARGET_TRIPLE)-install_name_tool -change "$(GEOS_NATIVE_LIB_DIR)/libgeos.3.8.1.dylib" "@rpath/libgeos.3.8.1.dylib" lib.docker_amd64/libgeos_c.dylib
+else ifdef geos_require_patchelf
+# We apply a similar fix for linux, allowing one to dlopen libgeos_c.so without
+# dlopening libgeos.so. Setting the rpath in the CMakeLists.txt does not work
+# for cross compilation.
+$(LIBGEOS): libgeos_inner .ALWAYS_REBUILD
+	patchelf --set-rpath '/usr/local/lib/cockroach/' lib/libgeos_c.so
+	patchelf --set-soname libgeos.so lib/libgeos.so
+	patchelf --replace-needed libgeos.so.3.8.1 libgeos.so lib/libgeos_c.so
 else
 $(LIBGEOS): libgeos_inner .ALWAYS_REBUILD
 endif
diff --git a/build/builder.sh b/build/builder.sh
index 4d730932aabc..3dad91dc82b9 100755
--- a/build/builder.sh
+++ b/build/builder.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 image=cockroachdb/builder
-version=20200818-182851
+version=20201001-110640
 
 function init() {
   docker build --tag="${image}" "$(dirname "${0}")/builder"
diff --git a/build/builder/Dockerfile b/build/builder/Dockerfile
index 06c941562334..e90462cce2cc 100644
--- a/build/builder/Dockerfile
+++ b/build/builder/Dockerfile
@@ -39,6 +39,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libncurses-dev \
     make \
     patch \
+    patchelf \
     texinfo \
     xz-utils \
  && apt-get clean
diff --git a/c-deps/geos-rebuild b/c-deps/geos-rebuild
index e682bb627eae..78ffe4545005 100644
--- a/c-deps/geos-rebuild
+++ b/c-deps/geos-rebuild
@@ -1,4 +1,4 @@
 Bump the version below when changing geos configure flags. Search for "BUILD
 ARTIFACT CACHING" in build/common.mk for rationale.
 
-4
+5