From f754353b74cb066ce4e9a1d000641d85d6ba3abb Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Wed, 7 Apr 2021 22:08:42 +0200 Subject: [PATCH] Spatialite-tools remove cflags from vcpkg_configure_make options (#17025) * remove CFLAGS from options * x-add-version spatialite-tools Co-authored-by: Ilya Arzhannikov --- ports/spatialite-tools/CONTROL | 4 ++-- ports/spatialite-tools/portfile.cmake | 1 - versions/baseline.json | 2 +- versions/s-/spatialite-tools.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index e3a430d4b30..7f02ba5dda8 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,6 +1,6 @@ Source: spatialite-tools Version: 5.0.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) -Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat, librttopo \ No newline at end of file +Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat, librttopo diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index 4b53010a3d3..b72e802b38a 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -124,7 +124,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" "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\"" "LIBS=${LIBS}" "--disable-minizip" diff --git a/versions/baseline.json b/versions/baseline.json index 58acf5ac936..a673849c0f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5666,7 +5666,7 @@ }, "spatialite-tools": { "baseline": "5.0.0", - "port-version": 1 + "port-version": 2 }, "spdk": { "baseline": "19.01.1", diff --git a/versions/s-/spatialite-tools.json b/versions/s-/spatialite-tools.json index 6f85784d923..2251060f044 100644 --- a/versions/s-/spatialite-tools.json +++ b/versions/s-/spatialite-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a54d2d339b5eaf4d37fc125c49b939822fdaf3ba", + "version-string": "5.0.0", + "port-version": 2 + }, { "git-tree": "e3d595427bd0b0cf8ddaadc45e400b5c1f9c1ccc", "version-string": "5.0.0",