mirror of https://git.wownero.com/dsc/mxe.git
update nsis
This commit is contained in:
parent
228cf95a69
commit
d9f4ce971e
|
@ -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'])
|
|
||||||
|
|
|
@ -4,8 +4,8 @@ PKG := nsis
|
||||||
$(PKG)_WEBSITE := https://nsis.sourceforge.io/
|
$(PKG)_WEBSITE := https://nsis.sourceforge.io/
|
||||||
$(PKG)_DESCR := NSIS
|
$(PKG)_DESCR := NSIS
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := 3.05
|
$(PKG)_VERSION := 3.06.1
|
||||||
$(PKG)_CHECKSUM := b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9
|
$(PKG)_CHECKSUM := 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0
|
||||||
$(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src
|
$(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src
|
||||||
$(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2
|
$(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2
|
||||||
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 3/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 3/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||||
|
|
Loading…
Reference in New Issue