Mercurial > mxe-octave

annotate src/nsis-1-explicit-mingw-cross-prefix.patch @ 2353:99516e73b368

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move doc/index.html -> index.html
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 29 Mar 2012 12:14:15 +0200
parents f653602a0500
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1838
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
1838
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4 This patch has been taken from:
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7 --- a/SCons/Tools/crossmingw.py
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 +++ b/SCons/Tools/crossmingw.py
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 @@ -61,6 +61,9 @@ prefixes = SCons.Util.Split("""
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 """)
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12 def find(env):
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13 + if env.has_key('MINGW_CROSS_PREFIX'):
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 + return env['MINGW_CROSS_PREFIX']
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 +
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 for prefix in prefixes:
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 # First search in the SCons path and then the OS path:
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 diff --git a/SConstruct b/SConstruct
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 index 80872bc..4f113dd 100755
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 --- a/SConstruct
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 +++ b/SConstruct
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 @@ -59,6 +59,7 @@ doc = [
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 path = ARGUMENTS.get('PATH', '')
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
26 toolset = ARGUMENTS.get('TOOLSET', '')
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 +mingw_cross_prefix = ARGUMENTS.get('MINGW_CROSS_PREFIX', '')
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 if toolset and path:
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30 defenv = Environment(ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 @@ -69,6 +70,8 @@ else:
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 defenv = Environment(TOOLS = toolset.split(',') + ['zip'])
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 if not toolset and not path:
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 defenv = Environment()
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35 +if mingw_cross_prefix:
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
36 + defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
37
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
38 Export('defenv')
f5b22f17e3ce bugfix: enable package nsis to use the correct MinGW cross toolchain on systems where multiple MinGW cross toolchains are present
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
39