Mercurial > mxe-octave
comparison src/gdal-2-ucrt.patch @ 5962:88dfa92d0c86
Add patches for building packages with UCRT.
* src/flac-1-ucrt.patch, src/gdal-2-ucrt.patch, src/mesa-2-ucrt.patch: Don't set
specific msvcrt version.
* src/flac.mk: autoreconf after applying patch.
* dist-files.mk: Add new files to build system.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 18 Nov 2021 14:59:34 +0100 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 5961:7c0066684448 | 5962:88dfa92d0c86 |
|---|---|
| 1 From bd4d925741b6c06ba38888a9bb959b490adf27af Mon Sep 17 00:00:00 2001 | |
| 2 From: Jeremy Drake <github@jdrake.com> | |
| 3 Date: Mon, 18 Oct 2021 11:02:08 -0700 | |
| 4 Subject: [PATCH] gdal: don't define __MSVCRT_VERSION__ | |
| 5 | |
| 6 --- gdal-3.3.2/port/cpl_port.h.orig 2021-10-18 10:57:01.393925700 -0700 | |
| 7 +++ gdal-3.3.2/port/cpl_port.h 2021-10-18 10:57:27.784506600 -0700 | |
| 8 @@ -113,15 +113,6 @@ | |
| 9 /* MinGW stuff */ | |
| 10 /* ==================================================================== */ | |
| 11 | |
| 12 -/* We need __MSVCRT_VERSION__ >= 0x0700 to have "_aligned_malloc" */ | |
| 13 -/* Latest versions of mingw32 define it, but with older ones, */ | |
| 14 -/* we need to define it manually */ | |
| 15 -#if defined(__MINGW32__) | |
| 16 -#ifndef __MSVCRT_VERSION__ | |
| 17 -#define __MSVCRT_VERSION__ 0x0700 | |
| 18 -#endif | |
| 19 -#endif | |
| 20 - | |
| 21 /* Needed for std=c11 on Solaris to have strcasecmp() */ | |
| 22 #if defined(GDAL_COMPILATION) && defined(__sun__) && (__STDC_VERSION__ + 0) >= 201112L && (_XOPEN_SOURCE + 0) < 600 | |
| 23 #ifdef _XOPEN_SOURCE |