diff options
| author | Ilya Arzhannikov <iarzhannikov@artec-group.com> | 2021-04-07 22:03:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 13:03:53 -0700 |
| commit | 3c21d6fa7eaf35f70a63894e4e2e9d5a8c6dce8c (patch) | |
| tree | 92830839c8d8dec1488eec3b7fe27a9d9fe6b484 | |
| parent | f716880bf61c731d85040e09190ee3a7e55185e4 (diff) | |
| download | vcpkg-3c21d6fa7eaf35f70a63894e4e2e9d5a8c6dce8c.tar.gz vcpkg-3c21d6fa7eaf35f70a63894e4e2e9d5a8c6dce8c.zip | |
Libspatialite remove cflags from vcpkg_configure_make options (#17024)
* remove CFLAGS from options
* x-add-version libspatialite
Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
| -rw-r--r-- | ports/libspatialite/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libspatialite/portfile.cmake | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libspatialite.json | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL index 0fbb05f8b..6ab4b3f4f 100644 --- a/ports/libspatialite/CONTROL +++ b/ports/libspatialite/CONTROL @@ -1,5 +1,6 @@ Source: libspatialite Version: 5.0.0 +Port-Version: 1 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
\ No newline at end of file +Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv, librttopo diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index fff7d69c7..84c49da3a 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -105,7 +105,6 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG OPTIONS - "CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" "LIBS=-lpthread -ldl -lm -l${STDLIB}" "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\"" "--enable-rttopo" @@ -124,4 +123,4 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index 1dbeb6bfc..4eb00a41e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3466,7 +3466,7 @@ }, "libspatialite": { "baseline": "5.0.0", - "port-version": 0 + "port-version": 1 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index 3bbe9b074..a37bee775 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b713a9368a0d53629cd8497cc82107ea6a33e980", + "version-string": "5.0.0", + "port-version": 1 + }, + { "git-tree": "f63638cb7e228e76cebf7e4a6c28902b4738f907", "version-string": "5.0.0", "port-version": 0 |