aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Arzhannikov <iarzhannikov@artec-group.com>2021-04-07 22:08:42 +0200
committerGitHub <noreply@github.com>2021-04-07 13:08:42 -0700
commitf754353b74cb066ce4e9a1d000641d85d6ba3abb (patch)
tree2a53aab29699ffe94e5263d9d62e746d35e53b0d
parentbf92aea42eba797c284d158bfe158b65ec3290e0 (diff)
downloadvcpkg-f754353b74cb066ce4e9a1d000641d85d6ba3abb.tar.gz
vcpkg-f754353b74cb066ce4e9a1d000641d85d6ba3abb.zip
Spatialite-tools remove cflags from vcpkg_configure_make options (#17025)
* remove CFLAGS from options * x-add-version spatialite-tools Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
-rw-r--r--ports/spatialite-tools/CONTROL4
-rw-r--r--ports/spatialite-tools/portfile.cmake1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/s-/spatialite-tools.json5
4 files changed, 8 insertions, 4 deletions
diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL
index e3a430d4b..7f02ba5dd 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 4b53010a3..b72e802b3 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 58acf5ac9..a673849c0 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 6f85784d9..2251060f0 100644
--- a/versions/s-/spatialite-tools.json
+++ b/versions/s-/spatialite-tools.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "a54d2d339b5eaf4d37fc125c49b939822fdaf3ba",
+ "version-string": "5.0.0",
+ "port-version": 2
+ },
+ {
"git-tree": "e3d595427bd0b0cf8ddaadc45e400b5c1f9c1ccc",
"version-string": "5.0.0",
"port-version": 1