Mercurial > mxe-octave

annotate src/nsis-1-fixes.patch @ 4605:a62c4469e2aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis: update to version 3.03
author John W. Eaton <jwe@octave.org>
date Mon, 26 Feb 2018 10:34:17 -0500
parents a14a5640d12b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
1 This file is part of MXE. See LICENSE.md for licensing information.
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2
2994
a1d474da2036 Update nsis to mxe devel branch 22-May 2013.
John Donoghue <john.donoghue@ieee.org>
parents: 2687
diff changeset
3 Contains ad hoc patches for cross building.
a1d474da2036 Update nsis to mxe devel branch 22-May 2013.
John Donoghue <john.donoghue@ieee.org>
parents: 2687
diff changeset
4
4118
a14a5640d12b nsis: update to 2.50
John Donoghue
parents: 3774
diff changeset
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
a14a5640d12b nsis: update to 2.50
John Donoghue
parents: 3774
diff changeset
6 From: Mark Brand <mabrand@mabrand.nl>
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 Date: Sun, 12 Aug 2012 12:33:26 +0200
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
8 Subject: [PATCH 1/1] explicit mingw cross prefix
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10 This patch has been taken from:
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11 http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py
4118
a14a5640d12b nsis: update to 2.50
John Donoghue
parents: 3774
diff changeset
14 index 1111111..2222222 100755
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 --- a/SCons/Tools/crossmingw.py
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 +++ b/SCons/Tools/crossmingw.py
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
17 @@ -65,6 +65,9 @@ prefixes = SCons.Util.Split("""
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 """)
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 def find(env):
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 + if env.has_key('MINGW_CROSS_PREFIX'):
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 + return env['MINGW_CROSS_PREFIX']
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 +
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
24 # Explicitly specified toolchain to build Windows executables
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
25 # takes predominance.
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
26 prefix = SCons.Script.ARGUMENTS.get('XGCC_W32_PREFIX', None)
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 diff --git a/SConstruct b/SConstruct
4118
a14a5640d12b nsis: update to 2.50
John Donoghue
parents: 3774
diff changeset
28 index 1111111..2222222 100755
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 --- a/SConstruct
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 +++ b/SConstruct
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
31 @@ -67,6 +67,7 @@ doctypes = [
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 path = ARGUMENTS.get('PATH', '')
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 toolset = ARGUMENTS.get('TOOLSET', '')
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
34 arch = ARGUMENTS.get('TARGET_ARCH', 'x86')
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 +mingw_cross_prefix = ARGUMENTS.get('MINGW_CROSS_PREFIX', '')
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 if toolset and path:
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
38 defenv = Environment(TARGET_ARCH = arch, ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
39 @@ -77,6 +78,8 @@ else:
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
40 defenv = Environment(TARGET_ARCH = arch, TOOLS = toolset.split(',') + ['zip'])
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 if not toolset and not path:
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents: 4118
diff changeset
42 defenv = Environment(TARGET_ARCH = arch)
2687
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 +if mingw_cross_prefix:
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 + defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 Export('defenv')
de129d8bdb4b package nsis: fixed build failure
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47