Mercurial > mxe-octave

annotate src/gdal-2-ucrt.patch @ 6213:5f64fb928091 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build-gcc: Avoid library clash when calling msgfmt. * src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when calling `msgfmt`. * dist-files.mk: Add patch to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 06 May 2022 19:36:10 +0200
parents 88dfa92d0c86
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5962
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From bd4d925741b6c06ba38888a9bb959b490adf27af Mon Sep 17 00:00:00 2001
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: Jeremy Drake <github@jdrake.com>
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Mon, 18 Oct 2021 11:02:08 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH] gdal: don't define __MSVCRT_VERSION__
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 --- gdal-3.3.2/port/cpl_port.h.orig 2021-10-18 10:57:01.393925700 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 +++ gdal-3.3.2/port/cpl_port.h 2021-10-18 10:57:27.784506600 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 @@ -113,15 +113,6 @@
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 /* MinGW stuff */
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 /* ==================================================================== */
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 -/* We need __MSVCRT_VERSION__ >= 0x0700 to have "_aligned_malloc" */
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 -/* Latest versions of mingw32 define it, but with older ones, */
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 -/* we need to define it manually */
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 -#if defined(__MINGW32__)
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 -#ifndef __MSVCRT_VERSION__
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 -#define __MSVCRT_VERSION__ 0x0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 -#endif
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 -#endif
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 -
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 /* Needed for std=c11 on Solaris to have strcasecmp() */
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 #if defined(GDAL_COMPILATION) && defined(__sun__) && (__STDC_VERSION__ + 0) >= 201112L && (_XOPEN_SOURCE + 0) < 600
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 #ifdef _XOPEN_SOURCE