[geos-commits] [SCM] GEOS branch master updated. ba7a93fa8ebf5b083a96b80958843e7ae820a9b4

[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, master has been updated
       via  ba7a93fa8ebf5b083a96b80958843e7ae820a9b4 (commit)
       via  10d0acf4e1c706544455efb5fe723566c1e5feac (commit)
      from  2d2963299472013861e184ca94930b632903a849 (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 ba7a93fa8ebf5b083a96b80958843e7ae820a9b4
Merge: 2d29632 10d0acf
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Dec 17 10:13:15 2020 -0800

    Merge branch 'tzakharko-fix-apple-aarch64'


commit 10d0acf4e1c706544455efb5fe723566c1e5feac
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 dc9d828..425d4a7 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