diff options
| author | Matthias Kuhn <matthias@opengis.ch> | 2021-06-21 22:45:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 13:45:47 -0700 |
| commit | 86a2be3f69a08c26eedffe126dff260da06b5503 (patch) | |
| tree | 5d902d702718d078963743546560e4926382d7ba /ports | |
| parent | 33d9cd45ffb089f790c7979653a906f28a35df98 (diff) | |
| download | vcpkg-86a2be3f69a08c26eedffe126dff260da06b5503.tar.gz vcpkg-86a2be3f69a08c26eedffe126dff260da06b5503.zip | |
[libspatialite] Fix building for android (#18452)
* [libspatialite] Fix building for android
* x-add-version
* Update versions/l-/libspatialite.json
* Update libspatialite.json
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/libspatialite/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libspatialite/portfile.cmake | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL index 6ab4b3f4f..a44f701dc 100644 --- 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 index 84c49da3a..5d73679be 100644 --- 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" |