diff options
| author | Tony Theodore <tonyt@logyst.com> | 2020-06-06 04:09:51 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2020-06-06 04:15:29 (GMT) |
| commit | 85943eb4371e0035d026b1815cbd9762e1b52449 (patch) | |
| tree | 2ac153acacaa916d1d9d2b0bb5ea3cb367f75814 | |
| parent | 4e15526c18c7d958c70828c643d0b9658da1f8fa (diff) | |
| download | mxe-85943eb4371e0035d026b1815cbd9762e1b52449.zip mxe-85943eb4371e0035d026b1815cbd9762e1b52449.tar.gz mxe-85943eb4371e0035d026b1815cbd9762e1b52449.tar.bz2 | |
mingw-w64: normalise patch
The previous update[1] left the patch in a state where it was applying
the same changeset twice with an incorrect commit message[2] for patch 2
[1] https://github.com/mxe/mxe/commit/8ed36bf81f40a37b4e7b5568a9c5c5b2cbf620ef
[2] https://github.com/mxe/mxe/blob/8ed36bf81f40a37b4e7b5568a9c5c5b2cbf620ef/src/mingw-w64-1.patch
| -rw-r--r-- | src/mingw-w64-1-fixes.patch | 31 | ||||
| -rw-r--r-- | src/mingw-w64-1.patch | 61 |
2 files changed, 31 insertions, 61 deletions
diff --git a/src/mingw-w64-1-fixes.patch b/src/mingw-w64-1-fixes.patch new file mode 100644 index 0000000..b1d48a0 --- /dev/null +++ b/src/mingw-w64-1-fixes.patch @@ -0,0 +1,31 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 29 Mar 2015 14:36:38 +0200 +Subject: [PATCH 1/1] workaround for -isystem flag messing up include order + +https://bugzilla.redhat.com/show_bug.cgi?id=843436 + +diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h +index 1111111..2222222 100644 +--- a/mingw-w64-headers/crt/float.h ++++ b/mingw-w64-headers/crt/float.h +@@ -114,6 +114,15 @@ + #define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ + #define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ + ++ /* The difference between 1 and the least value greater than 1 that is ++ representable in the given floating point type, b**1-p. */ ++ #undef FLT_EPSILON ++ #undef DBL_EPSILON ++ #undef LDBL_EPSILON ++ #define FLT_EPSILON __FLT_EPSILON__ ++ #define DBL_EPSILON __DBL_EPSILON__ ++ #define LDBL_EPSILON __LDBL_EPSILON__ ++ + /* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown. */ + /* ??? This is supposed to change with calls to fesetround in <fenv.h>. */ + #undef FLT_ROUNDS diff --git a/src/mingw-w64-1.patch b/src/mingw-w64-1.patch deleted file mode 100644 index 8a25cef..0000000 --- a/src/mingw-w64-1.patch +++ /dev/null @@ -1,61 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 29 Mar 2015 14:36:38 +0200 -Subject: [PATCH 1/2] workaround for -isystem flag messing up include order - -https://bugzilla.redhat.com/show_bug.cgi?id=843436 - -diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h -index 1111111..2222222 100644 ---- a/mingw-w64-headers/crt/float.h -+++ b/mingw-w64-headers/crt/float.h -@@ -114,6 +114,15 @@ - #define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ - #define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ - -+ /* The difference between 1 and the least value greater than 1 that is -+ representable in the given floating point type, b**1-p. */ -+ #undef FLT_EPSILON -+ #undef DBL_EPSILON -+ #undef LDBL_EPSILON -+ #define FLT_EPSILON __FLT_EPSILON__ -+ #define DBL_EPSILON __DBL_EPSILON__ -+ #define LDBL_EPSILON __LDBL_EPSILON__ -+ - /* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown. */ - /* ??? This is supposed to change with calls to fesetround in <fenv.h>. */ - #undef FLT_ROUNDS - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jonathan Yong <10walls@gmail.com> -Date: Fri, 22 Dec 2017 13:01:03 +0000 -Subject: [PATCH 2/2] dwmapi.def: Regenegerate from Windows 10 - -Remove ordinals from x86 library too. - -Signed-off-by: Jonathan Yong <10walls@gmail.com> - -Taken from: https://sourceforge.net/p/mingw-w64/mailman/message/36166386/ - -diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h -index 1111111..2222222 100644 ---- a/mingw-w64-headers/crt/float.h -+++ b/mingw-w64-headers/crt/float.h -@@ -114,6 +114,15 @@ - #define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ - #define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ - -+ /* The difference between 1 and the least value greater than 1 that is -+ representable in the given floating point type, b**1-p. */ -+ #undef FLT_EPSILON -+ #undef DBL_EPSILON -+ #undef LDBL_EPSILON -+ #define FLT_EPSILON __FLT_EPSILON__ -+ #define DBL_EPSILON __DBL_EPSILON__ -+ #define LDBL_EPSILON __LDBL_EPSILON__ -+ - /* The difference between 1 and the least value greater than 1 that is - representable in the given floating point type, b**1-p. */ - #undef FLT_EPSILON |