diff options
| author | Marc Brückner <marc@ma-br.de> | 2020-08-18 13:01:27 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2020-08-19 02:19:07 (GMT) |
| commit | d9f4ce971e0daaf904fe854c7f8b044fef867da6 (patch) | |
| tree | c409b20c5e119ff60f640e26f8ddc8ef7a3a2b47 | |
| parent | 228cf95a697aa838c79bd1ec6d9cf4c434e83636 (diff) | |
| download | mxe-d9f4ce971e0daaf904fe854c7f8b044fef867da6.zip mxe-d9f4ce971e0daaf904fe854c7f8b044fef867da6.tar.gz mxe-d9f4ce971e0daaf904fe854c7f8b044fef867da6.tar.bz2 | |
update nsis
| -rw-r--r-- | src/nsis-1-fixes.patch | 30 | ||||
| -rw-r--r-- | src/nsis.mk | 4 |
2 files changed, 2 insertions, 32 deletions
diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch deleted file mode 100644 index 8204d05..0000000 --- a/src/nsis-1-fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Anders <anders_k@users.sourceforge.net> -Date: Sat, 27 Jun 2020 23:18:45 +0000 -Subject: [PATCH 1/1] Don't let GCC 10 generate memmove calls (bug #1248) - -see: -https://sourceforge.net/p/nsis/bugs/1248/ - -taken from: -https://github.com/kichik/nsis/commit/6d9cfd3ef8296e3f9c0be9b3dbe01f0f3491b3dd.patch - -diff --git a/SCons/Config/gnu b/SCons/Config/gnu -index 1111111..2222222 100755 ---- a/SCons/Config/gnu -+++ b/SCons/Config/gnu -@@ -103,6 +103,10 @@ stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no standard libraries - stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align - stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file - -+conf = FlagsConfigure(stub_env) -+conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns') # GCC 10: Don't generate msvcrt!memmove calls (bug #1248) -+conf.Finish() -+ - stub_uenv = stub_env.Clone() - stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) - diff --git a/src/nsis.mk b/src/nsis.mk index 48dde94..4f14cbc 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -4,8 +4,8 @@ PKG := nsis $(PKG)_WEBSITE := https://nsis.sourceforge.io/ $(PKG)_DESCR := NSIS $(PKG)_IGNORE := -$(PKG)_VERSION := 3.05 -$(PKG)_CHECKSUM := b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9 +$(PKG)_VERSION := 3.06.1 +$(PKG)_CHECKSUM := 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0 $(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src $(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 3/$($(PKG)_VERSION)/$($(PKG)_FILE) |