[geos-commits] [SCM] GEOS branch 3.8 updated. 558257e31991c4028d111581c08968bfa9706af8

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, 3.8 has been updated
       via  558257e31991c4028d111581c08968bfa9706af8 (commit)
      from  d1f6bc89e2748ffb3f64e9ea53c0ec42c55a0c0e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 558257e31991c4028d111581c08968bfa9706af8
Author: Taras Zakharko <taras.zakharko at gmail.com>
Date:   Tue Dec 15 17:16:03 2020 +0100

    Disable additional inlining definitions when building for Apple ARM64 targets as they result in linker errors

diff --git a/src/inlines.cpp b/src/inlines.cpp
index 273eb83..e0d6e26 100644
--- a/src/inlines.cpp
+++ b/src/inlines.cpp
@@ -35,6 +35,9 @@
 // the stubs correctly at link time by itself
 #if !defined(__CYGWIN__)
 
+// Same as above for Apple ARM64 platforms
+#if !(defined(__APPLE__) && defined(__aarch64__))
+
 // Undefine GEOS_INLINE so that .inl files
 // will be ready for an implementation file
 #undef GEOS_INLINE
@@ -65,6 +68,8 @@
 #include <geos/noding/BasicSegmentString.inl>
 #include <geos/noding/MCIndexNoder.inl>
 
+#endif // defined __APPLE__ && defined  __aarch64__
+
 #endif // defined __CYGWIN__
 
 #endif // defined __MINGW32__ and !defined GEOS_DLL_EXPORT

-----------------------------------------------------------------------

Summary of changes:
 src/inlines.cpp | 5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
GEOS