Mercurial > mxe-octave

annotate src/nsis-2-fixes.patch @ 7075:1220e3b8427e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis: update to nsisbi v7405-1 * src/nsis.mk: update version, url, checksum * src/nsis-2-fixes.patch: update patch
author John Donoghue <john.donoghue@ieee.org>
date Thu, 15 Feb 2024 16:01:16 -0500
parents 56320dd51677
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7075
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
1 diff -ur nsis-code-7405-1-NSIS-trunk.orig/SCons/Config/gnu nsis-code-7405-1-NSIS-trunk/SCons/Config/gnu
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
2 --- nsis-code-7405-1-NSIS-trunk.orig/SCons/Config/gnu 2024-02-15 10:57:22.343383597 -0500
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
3 +++ nsis-code-7405-1-NSIS-trunk/SCons/Config/gnu 2024-02-15 11:00:48.067246323 -0500
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
4 @@ -54,7 +54,7 @@
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
5 # Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
6 def configure_static_libs(env):
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
7 env.Append(LINKFLAGS = ['-static-libgcc'])
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
8 - env.Append(LINKFLAGS = ['-static-libstdc++']) # MinGW GCC 4.5.2 warns about unrecognized option but it also actually needs it!
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
9 + #env.Append(LINKFLAGS = ['-static-libstdc++']) # MinGW GCC 4.5.2 warns about unrecognized option but it also actually needs it!
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10
7075
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
11 if defenv['PLATFORM'] == 'win32':
1220e3b8427e nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents: 4612
diff changeset
12 configure_static_libs(defenv)