[libspatialite] Fix building for android (#18452)

* [libspatialite] Fix building for android * x-add-version * Update versions/l-/libspatialite.json * Update libspatialite.json
microsoft · Jun 21, 2021 · 86a2be3 · 86a2be3
1 parent 33d9cd4
commit 86a2be3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL
@@ -1,6 +1,6 @@
 Source: libspatialite
 Version: 5.0.0
-Port-Version: 1
+Port-Version: 2
 Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources
 Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.
 Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv, librttopo
diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake
@@ -85,13 +85,15 @@ if (VCPKG_TARGET_IS_WINDOWS)
       file(RENAME ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib)
       file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib)
   endif()
-elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
+else () # Build in UNIX
   if(VCPKG_TARGET_IS_LINUX)
       set(STDLIB stdc++)
   else()
       set(STDLIB c++)
   endif()
-
+  if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
+    SET(EXTRALIBS "-lpthread")
+  endif()
   list(APPEND OPTIONS_RELEASE
       "LIBXML2_LIBS=-lxml2 -llzma"
       "GEOS_LDFLAGS=-lgeos_c -lgeos -l${STDLIB}"
@@ -105,7 +107,7 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX
       SOURCE_PATH ${SOURCE_PATH}
       AUTOCONFIG
       OPTIONS
-          "LIBS=-lpthread -ldl -lm -l${STDLIB}"
+          "LIBS=${EXTRALIBS} -ldl -lm -l${STDLIB}"
           "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\""
           "--enable-rttopo"
           "--enable-gcp"

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3554,7 +3554,7 @@
     },
     "libspatialite": {
       "baseline": "5.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "libspnav": {
       "baseline": "0.2.3",

diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ac8547f60ac2cc08c65a907a84112e1256011a47",
+      "version-string": "5.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b713a9368a0d53629cd8497cc82107ea6a33e980",
       "version-string": "5.0.0",