Mercurial > mxe-octave
changeset 7075:1220e3b8427e
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 | d4c97e227a40 |
| children | 9fc9c07fcc91 |
| files | src/nsis-2-fixes.patch src/nsis.mk |
| diffstat | 2 files changed, 14 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/nsis-2-fixes.patch Wed Feb 14 16:06:08 2024 -0500 +++ b/src/nsis-2-fixes.patch Thu Feb 15 16:01:16 2024 -0500 @@ -1,23 +1,12 @@ -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__))"' +diff -ur nsis-code-7405-1-NSIS-trunk.orig/SCons/Config/gnu nsis-code-7405-1-NSIS-trunk/SCons/Config/gnu +--- nsis-code-7405-1-NSIS-trunk.orig/SCons/Config/gnu 2024-02-15 10:57:22.343383597 -0500 ++++ nsis-code-7405-1-NSIS-trunk/SCons/Config/gnu 2024-02-15 11:00:48.067246323 -0500 +@@ -54,7 +54,7 @@ + # Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL + def configure_static_libs(env): + env.Append(LINKFLAGS = ['-static-libgcc']) +- env.Append(LINKFLAGS = ['-static-libstdc++']) # MinGW GCC 4.5.2 warns about unrecognized option but it also actually needs it! ++ #env.Append(LINKFLAGS = ['-static-libstdc++']) # MinGW GCC 4.5.2 warns about unrecognized option but it also actually needs it! --# 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']) + if defenv['PLATFORM'] == 'win32': + configure_static_libs(defenv)
--- a/src/nsis.mk Wed Feb 14 16:06:08 2024 -0500 +++ b/src/nsis.mk Thu Feb 15 16:01:16 2024 -0500 @@ -3,11 +3,11 @@ PKG := nsis $(PKG)_IGNORE := -$(PKG)_VERSION := 7336-1 -$(PKG)_CHECKSUM := 1ab627713f2da6bc061601cce1427e3b5ae0f629 +$(PKG)_VERSION := 7405-1 +$(PKG)_CHECKSUM := 676a8ec96642e36b5e091b28f08ace524f8202b3 $(PKG)_SUBDIR := nsis-code-$($(PKG)_VERSION)-NSIS-trunk $(PKG)_FILE := nsis-code-$($(PKG)_VERSION)-NSIS-trunk.zip -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/nsisbi/nsisbi3.08.1/$($(PKG)_FILE) +$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/nsisbi/nsisbi3.09.1/$($(PKG)_FILE) $(PKG)_DEPS := build-scons build-setuptools define $(PKG)_UPDATE