diff options
| author | Daniele Lupo <jepessen@wteam.it> | 2019-05-10 00:00:16 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-09 15:00:16 -0700 |
| commit | e2f45664c96a7e3f1881785ac8e66f5581158935 (patch) | |
| tree | a9ffdf3cde3d33143d2272e49299853c7fb6d085 | |
| parent | 5ae66b807450b19378ec615b387e6b8044cb7084 (diff) | |
| download | vcpkg-e2f45664c96a7e3f1881785ac8e66f5581158935.tar.gz vcpkg-e2f45664c96a7e3f1881785ac8e66f5581158935.zip | |
[gdal] fixed compilation issue with std::fabs (#6336)
| -rw-r--r-- | ports/gdal/0003-Fix-std-fabs.patch | 10 | ||||
| -rw-r--r-- | ports/gdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gdal/portfile.cmake | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/ports/gdal/0003-Fix-std-fabs.patch b/ports/gdal/0003-Fix-std-fabs.patch new file mode 100644 index 000000000..4a6ba7cb3 --- /dev/null +++ b/ports/gdal/0003-Fix-std-fabs.patch @@ -0,0 +1,10 @@ +--- a/ogrlinestring.cpp Fri Dec 14 22:34:20 2018 ++++ b/ogrlinestring.cpp Wed Mar 27 11:00:00 2019 +@@ -34,6 +34,7 @@ + #include <cstdlib> + #include <algorithm> + #include <limits> ++#include <cmath> + + CPL_CVSID("$Id: ogrlinestring.cpp 61153d33d7f055c3442ff728adbfa8e09582464b 2019-03-10 14:23:51 +0100 Even Rouault $") + diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 233c5145f..155851ad8 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,5 +1,5 @@ Source: gdal -Version: 2.4.1-3 +Version: 2.4.1-4 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 1db028ef9..35bf5e4b2 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -47,6 +47,11 @@ foreach(BUILD_TYPE IN LISTS BUILD_TYPES) ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch ) endif() + vcpkg_apply_patches( + SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}/ogr + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-std-fabs.patch + ) endforeach() |