diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-08-12 10:47:22 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2012-08-12 10:47:26 (GMT) |
| commit | e5dca85daf9db16376abe41396ec0153ec6f51a1 (patch) | |
| tree | c6aef93130f624ea29876fcb69c976fe2133b02b | |
| parent | 66e873abe4b7494a6f2962dac1fff99a51445671 (diff) | |
| download | mxe-e5dca85daf9db16376abe41396ec0153ec6f51a1.zip mxe-e5dca85daf9db16376abe41396ec0153ec6f51a1.tar.gz mxe-e5dca85daf9db16376abe41396ec0153ec6f51a1.tar.bz2 | |
package nsis: fixed build failure
Thanks to <free.man.uu@gmail.com>
| -rw-r--r-- | src/nsis-1-fixes.patch (renamed from src/nsis-1-explicit-mingw-cross-prefix.patch) | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/nsis-1-explicit-mingw-cross-prefix.patch b/src/nsis-1-fixes.patch index af10791..b967082 100644 --- a/src/nsis-1-explicit-mingw-cross-prefix.patch +++ b/src/nsis-1-fixes.patch @@ -1,9 +1,16 @@ This file is part of MXE. See index.html for further information. +From 1cc3dd0dfd47bab82e06be916f9e57ef783406f9 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 12 Aug 2012 12:33:26 +0200 +Subject: [PATCH 1/2] explicit mingw cross prefix + This patch has been taken from: http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 +diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py +index d27e01c..fef9150 100755 --- a/SCons/Tools/crossmingw.py +++ b/SCons/Tools/crossmingw.py @@ -61,6 +61,9 @@ prefixes = SCons.Util.Split(""" @@ -37,3 +44,28 @@ index 80872bc..4f113dd 100755 Export('defenv') +-- +1.7.10.4 + + +From 7df0fa80a65279ee7d99da8ec6abdddff7e040b0 Mon Sep 17 00:00:00 2001 +From: freeman <free.man.uu@gmail.com> +Date: Sun, 12 Aug 2012 12:36:39 +0200 +Subject: [PATCH 2/2] add missing header + + +diff --git a/Source/util.h b/Source/util.h +index 4259a6a..664923e 100755 +--- a/Source/util.h ++++ b/Source/util.h +@@ -25,6 +25,7 @@ + #ifndef _WIN32 + # include <iconv.h> + # include <stdio.h> ++# include <unistd.h> + #endif + + +-- +1.7.10.4 + |