Mercurial > mxe-octave

changeset 4814:3cb0c4f3e842

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis: use recomennted nsis xcompile options * dist-files.mk: remove ref to nsis-1-fixes.patch * src/nsis-1-fixes.patch: removed * src/nsis.mk: use XGCC_W32_PREFIX instead of MINGW_CROSS_PREFIX
author John Donoghue
date Thu, 23 Aug 2018 12:45:34 -0400
parents 6ef958afc65d
children 62a50e15a0b3
files dist-files.mk src/nsis-1-fixes.patch src/nsis.mk
diffstat 3 files changed, 1 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Aug 23 08:19:37 2018 -0400
+++ b/dist-files.mk	Thu Aug 23 12:45:34 2018 -0400
@@ -444,7 +444,6 @@
   nettle-1-fixes.patch \
   nettle.mk \
   npp.mk \
-  nsis-1-fixes.patch \
   nsis-2-fixes.patch \
   nsis.mk \
   ocaml-core-1-fixes.patch \
--- a/src/nsis-1-fixes.patch	Thu Aug 23 08:19:37 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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: Mark Brand <mabrand@mabrand.nl>
-Date: Sun, 12 Aug 2012 12:33:26 +0200
-Subject: [PATCH 1/1] explicit mingw cross prefix
-
-This patch has been taken from:
-http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085
-
-diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py
-index 1111111..2222222 100755
---- a/SCons/Tools/crossmingw.py
-+++ b/SCons/Tools/crossmingw.py
-@@ -65,6 +65,9 @@ prefixes = SCons.Util.Split("""
- """)
- 
- def find(env):
-+    if env.has_key('MINGW_CROSS_PREFIX'):
-+        return env['MINGW_CROSS_PREFIX']
-+
-     # Explicitly specified toolchain to build Windows executables
-     # takes predominance.
-     prefix = SCons.Script.ARGUMENTS.get('XGCC_W32_PREFIX', None)
-diff --git a/SConstruct b/SConstruct
-index 1111111..2222222 100755
---- a/SConstruct
-+++ b/SConstruct
-@@ -67,6 +67,7 @@ doctypes = [
- path = ARGUMENTS.get('PATH', '')
- toolset = ARGUMENTS.get('TOOLSET', '')
- arch = ARGUMENTS.get('TARGET_ARCH', 'x86')
-+mingw_cross_prefix = ARGUMENTS.get('MINGW_CROSS_PREFIX', '')
- 
- if toolset and path:
- 	defenv = Environment(TARGET_ARCH = arch, ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
-@@ -77,6 +78,8 @@ else:
- 		defenv = Environment(TARGET_ARCH = arch, TOOLS = toolset.split(',') + ['zip'])
- if not toolset and not path:
- 	defenv = Environment(TARGET_ARCH = arch)
-+if mingw_cross_prefix:
-+	defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix
- 
- Export('defenv')
- 
--- a/src/nsis.mk	Thu Aug 23 08:19:37 2018 -0400
+++ b/src/nsis.mk	Thu Aug 23 12:45:34 2018 -0400
@@ -28,7 +28,7 @@
     $($(PKG)_PREBUILD)
     cd '$(1)' && scons VERBOSE=1 \
         PATH='$(PATH)' \
-        MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \
+        XGCC_W32_PREFIX='$(MXE_TOOL_PREFIX)' \
         PREFIX='$(BUILD_TOOLS_PREFIX)' \
         $($(PKG)_TARGET_SCON_OPTIONS) \
         SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \