d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mingw-w64: update

This commit is contained in:
Mark Brand 2015-08-05 09:18:53 +02:00
parent ba8dbe0fb7
commit 661fa057c2
2 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mingw-w64-1.patch
View File

@ -1,10 +1,10 @@
This file is part of MXE.
See index.html for further information.
From 8de1a5d893f5eba0d54731ad4eeff4b0128798be Mon Sep 17 00:00:00 2001
From 1b750c225c874854ed1fc254b6bee7c50376d537 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
Subject: [PATCH] workaround for -isystem flag messing up include order
https://bugzilla.redhat.com/show_bug.cgi?id=843436
@ -29,34 +29,5 @@ index 5874f4e..c031ce0 100644
/* ??? This is supposed to change with calls to fesetround in <fenv.h>. */
#undef FLT_ROUNDS
--
2.1.0
From 0637bae1999f6dcd7932d1d844db57f1e0c6104c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
Date: Wed, 18 Mar 2015 14:06:33 +0000
Subject: [PATCH 2/2] Add more includes to shlobj.h
wtypesbase.h and wincrypt.h pull some other headers,
together they all provide EXTERN_C, DECLSPEC_IMPORT and WINAPI macros,
which are needed by shlobj.h directly or indirectly.
(cherry picked from commit 6c56d0b0eb5be9fbeb552ba070a2304b842a5102)
diff --git a/mingw-w64-headers/include/shlobj.h b/mingw-w64-headers/include/shlobj.h
index 3d2e21c..be087c4 100644
--- a/mingw-w64-headers/include/shlobj.h
+++ b/mingw-w64-headers/include/shlobj.h
@@ -6,6 +6,8 @@
#ifndef _SHLOBJ_H_
#define _SHLOBJ_H_
+#include <wtypesbase.h>
+#include <wincrypt.h>
#include <winapifamily.h>
#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT)
--
2.1.0
2.1.4

4
src/mingw-w64.mk
View File

@ -3,8 +3,8 @@
PKG := mingw-w64
$(PKG)_IGNORE :=
$(PKG)_VERSION := 4.0.2
$(PKG)_CHECKSUM := b266b6d7393ee494612db49b0b54c5aaffaf042f
$(PKG)_VERSION := 4.0.4
$(PKG)_CHECKSUM := eec5142fec7d193c4ecff92959e54237f40f99c7
$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)