Mercurial > mxe-octave
view src/nsis-2-fixes.patch @ 4740:9942a9c37ffe
remove octave 'alpha' package
* octave-1-gnulib.patch, octave.mk: Delete.
* dist-files.mk: Update.
* index.html: Delete entry for octave.
* configure.ac: Don't handle 'alpha' in --enable-octave=VERSION option.
(AC_CONFIG_SRCDIR): Look for src/default-octave.mk instead of
src/octave.mk.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 26 Jun 2018 13:22:51 -0400 |
| parents | 56320dd51677 |
| children | 1220e3b8427e |
line wrap: on
line source
diff -ur nsis-3.03-src.orig/SCons/Config/gnu nsis-3.03-src/SCons/Config/gnu --- nsis-3.03-src.orig/SCons/Config/gnu 2018-03-03 19:38:08.620291177 -0500 +++ nsis-3.03-src/SCons/Config/gnu 2018-03-03 19:38:20.109576191 -0500 @@ -45,11 +45,6 @@ defenv['MSVCRT_FLAG'] = '' defenv['STDCALL'] = '"__attribute__((__stdcall__))"' -# Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL -if defenv['PLATFORM'] == 'win32': - defenv.Append(LINKFLAGS = ['-static-libgcc']) - defenv.Append(LINKFLAGS = ['-static-libstdc++']) - ### defines defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')]) @@ -141,7 +136,6 @@ plugin_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency -plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency plugin_uenv = plugin_env.Clone() plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])