diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-08-24 16:44:47 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-08-24 16:44:47 (GMT) |
| commit | c54cb0274cf668293d71b617a7169200b1e59256 (patch) | |
| tree | a1f76b052c52ecd57232cb04d896317e5c860342 | |
| parent | 517df3a38933100332eba4a36c1a2029fc6f0181 (diff) | |
| download | mxe-c54cb0274cf668293d71b617a7169200b1e59256.zip mxe-c54cb0274cf668293d71b617a7169200b1e59256.tar.gz mxe-c54cb0274cf668293d71b617a7169200b1e59256.tar.bz2 | |
update package mingwrt
| -rw-r--r-- | src/libarchive-1-fixes.patch | 27 | ||||
| -rw-r--r-- | src/libdnet-1-fixes.patch | 29 | ||||
| -rw-r--r-- | src/mingwrt-1-float.patch | 19 | ||||
| -rw-r--r-- | src/mingwrt.mk | 4 |
4 files changed, 58 insertions, 21 deletions
diff --git a/src/libarchive-1-fixes.patch b/src/libarchive-1-fixes.patch new file mode 100644 index 0000000..b9545a5 --- /dev/null +++ b/src/libarchive-1-fixes.patch @@ -0,0 +1,27 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 5dc5ed0a476884c696e0ac01f9298ba02c213290 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 24 Aug 2011 18:08:23 +0200 +Subject: [PATCH] do not redefine ssize_t + + +diff --git a/libarchive/archive.h b/libarchive/archive.h +index 5ca28eb..f33a8ed 100644 +--- a/libarchive/archive.h ++++ b/libarchive/archive.h +@@ -52,7 +52,7 @@ + /* These should match the types used in 'struct stat' */ + #if defined(_WIN32) && !defined(__CYGWIN__) + #define __LA_INT64_T __int64 +-# if defined(_SSIZE_T_DEFINED) ++# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_) + # define __LA_SSIZE_T ssize_t + # elif defined(_WIN64) + # define __LA_SSIZE_T __int64 +-- +1.7.6 + diff --git a/src/libdnet-1-fixes.patch b/src/libdnet-1-fixes.patch new file mode 100644 index 0000000..a5337e6 --- /dev/null +++ b/src/libdnet-1-fixes.patch @@ -0,0 +1,29 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 830ac87570520d72a173a351c082503c4d1b2911 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 24 Aug 2011 18:01:19 +0200 +Subject: [PATCH] do not redefine ssize_t + + +diff --git a/include/dnet/os.h b/include/dnet/os.h +index c12c7b2..9e8bdd2 100644 +--- a/include/dnet/os.h ++++ b/include/dnet/os.h +@@ -23,8 +23,10 @@ + typedef u_short uint16_t; + typedef u_int uint32_t; + # ifndef __CYGWIN__ ++# ifndef _SSIZE_T_ + typedef long ssize_t; + # endif ++# endif + #else + # include <sys/param.h> + # include <sys/types.h> +-- +1.7.6 + diff --git a/src/mingwrt-1-float.patch b/src/mingwrt-1-float.patch deleted file mode 100644 index 6cf9c81..0000000 --- a/src/mingwrt-1-float.patch +++ /dev/null @@ -1,19 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 -http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html - -diff -urN a/include/float.h b/include/float.h ---- a/include/float.h 2010-03-07 04:31:41.000000000 +0100 -+++ b/include/float.h 2010-06-05 12:29:08.899723741 +0200 -@@ -16,8 +16,6 @@ - * - */ - --#include_next<float.h> -- - #ifndef _MINGW_FLOAT_H_ - #define _MINGW_FLOAT_H_ - diff --git a/src/mingwrt.mk b/src/mingwrt.mk index 993d730..52a5a8d 100644 --- a/src/mingwrt.mk +++ b/src/mingwrt.mk @@ -4,8 +4,8 @@ # MinGW Runtime PKG := mingwrt $(PKG)_IGNORE := -$(PKG)_VERSION := 3.18 -$(PKG)_CHECKSUM := 0c562f3b6a89f376b9edba48ccd7388c535f8c8d +$(PKG)_VERSION := 3.20 +$(PKG)_CHECKSUM := 7c63f3695968054b7236282f35562bb3a2c388d4 $(PKG)_SUBDIR := . $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-mingw32-dev.tar.gz $(PKG)_WEBSITE := http://www.mingw.org/ |