diff options
| author | Mateusz Loskot <mateusz@loskot.net> | 2018-05-18 08:46:04 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-17 23:46:04 -0700 |
| commit | 0aad7df94445ea0eb8d6dfe3acf07fac9a4e9fa9 (patch) | |
| tree | 044e32caed18691afed511ab7dd8109b4db7faba /ports/gdal/0001-Fix-debug-crt-flags.patch | |
| parent | 2978f18ad33b138581d06badae64ad08fdff4653 (diff) | |
| download | vcpkg-0aad7df94445ea0eb8d6dfe3acf07fac9a4e9fa9.tar.gz vcpkg-0aad7df94445ea0eb8d6dfe3acf07fac9a4e9fa9.zip | |
[GDAL] Update to 2.3.0 (#3478)
Update portfile.cmake for easier version/checksum maintenance.
Update and rename 0001 patch fixing debug build.
Update no-my-bool.patch following source file changes.
Remove no patches which are no longer required due to corresponding
changes in the GDAL source code.
Supports PROJ 4.9.x and 5.x - the latter not in vcpkg ports.
Diffstat (limited to 'ports/gdal/0001-Fix-debug-crt-flags.patch')
| -rw-r--r-- | ports/gdal/0001-Fix-debug-crt-flags.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/ports/gdal/0001-Fix-debug-crt-flags.patch b/ports/gdal/0001-Fix-debug-crt-flags.patch new file mode 100644 index 000000000..753d53131 --- /dev/null +++ b/ports/gdal/0001-Fix-debug-crt-flags.patch @@ -0,0 +1,27 @@ +diff -Nuar a/nmake.opt b/nmake.opt +--- a/nmake.opt 2018-05-04 09:05:46.000000000 +0200 ++++ b/nmake.opt 2018-05-11 22:58:39.387603800 +0200 +@@ -120,11 +120,21 @@ + CXX_PDB_FLAGS= + !ENDIF + ++# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd) ++# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well ++!IFNDEF CXX_CRT_FLAGS ++!IFNDEF DEBUG ++CXX_CRT_FLAGS=/MD ++!ELSE ++CXX_CRT_FLAGS=/MDd ++!ENDIF ++!ENDIF ++ + !IFNDEF OPTFLAGS + !IFNDEF DEBUG +-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG ++OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG + !ELSE +-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG ++OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG + !ENDIF + !ENDIF # OPTFLAGS + |