Mercurial > mxe-octave
view src/nsis-2-fixes.patch @ 5531:eae508c12529
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 |
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'])