Mercurial > mxe-octave

annotate src/nsis-2-fixes.patch @ 5531:eae508c12529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +0200
parents 56320dd51677
children 1220e3b8427e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4612
56320dd51677 nsis: plugin requires static gcc linking
John D
parents: 4605
diff changeset
1 diff -ur nsis-3.03-src.orig/SCons/Config/gnu nsis-3.03-src/SCons/Config/gnu
56320dd51677 nsis: plugin requires static gcc linking
John D
parents: 4605
diff changeset
2 --- nsis-3.03-src.orig/SCons/Config/gnu 2018-03-03 19:38:08.620291177 -0500
56320dd51677 nsis: plugin requires static gcc linking
John D
parents: 4605
diff changeset
3 +++ nsis-3.03-src/SCons/Config/gnu 2018-03-03 19:38:20.109576191 -0500
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -45,11 +45,6 @@
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 defenv['MSVCRT_FLAG'] = ''
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 defenv['STDCALL'] = '"__attribute__((__stdcall__))"'
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -# Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 -if defenv['PLATFORM'] == 'win32':
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 - defenv.Append(LINKFLAGS = ['-static-libgcc'])
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 - defenv.Append(LINKFLAGS = ['-static-libstdc++'])
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 -
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 ### defines
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')])
4612
56320dd51677 nsis: plugin requires static gcc linking
John D
parents: 4605
diff changeset
16 @@ -141,7 +136,6 @@
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 plugin_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
4612
56320dd51677 nsis: plugin requires static gcc linking
John D
parents: 4605
diff changeset
19 plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 -plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 plugin_uenv = plugin_env.Clone()
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])