Skip to content

Commit feb9acf

Browse files
czentgrfacebook-github-bot
authored andcommitted
build(geos): Patch the macOS setup install of geos (facebookincubator#13354)
Summary: The bundled version of geos fixes some issues that address build issues on macOS with unknown type size_t and other things. Pull Request resolved: facebookincubator#13354 Reviewed By: gggrace14 Differential Revision: D74846099 Pulled By: xiaoxmeng fbshipit-source-id: b0bf7c519603df8924a637ca782d426b34027d8a
1 parent 9a7867c commit feb9acf

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

scripts/setup-macos.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,14 @@ function install_stemmer {
191191

192192
function install_geos {
193193
if [[ "$BUILD_GEOS" == "true" ]]; then
194+
ABSOLUTE_SCRIPTDIR=$(realpath ${SCRIPTDIR})
194195
wget_and_untar https://github.com/libgeos/geos/archive/${GEOS_VERSION}.tar.gz geos
196+
(
197+
# Adopted from the bundled patching needed for macOS.
198+
cd ${DEPENDENCY_DIR}/geos
199+
git apply "${ABSOLUTE_SCRIPTDIR}/../CMake/resolve_dependency_modules/geos/geos-cmakelists.patch"
200+
git apply "${ABSOLUTE_SCRIPTDIR}/../CMake/resolve_dependency_modules/geos/geos-build.patch"
201+
)
195202
cmake_install_dir geos -DBUILD_TESTING=OFF
196203
fi
197204
}

0 commit comments

Comments
 (0)