Skip to content

[gdal] fixed compilation issue with std::fabs #6336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rastaban merged 5 commits into from
May 9, 2019
Merged

[gdal] fixed compilation issue with std::fabs #6336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00ce2b2
[gdal] fixed compilation issue with std::fabs
jepessen May 7, 2019
20dbf1b
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jepessen May 8, 2019
e227157
[gdal] bumped version number.
jepessen May 8, 2019
1e9e953
(#6336) Merge branch 'gdal'
jepessen May 8, 2019
4b3c675
Merge branch 'master' of https://github.com/microsoft/vcpkg
jepessen May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ports/gdal/0003-Fix-std-fabs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 $")

2 changes: 1 addition & 1 deletion ports/gdal/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 5 additions & 0 deletions ports/gdal/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down