Mercurial > mxe-octave
view src/nsis-1-fixes.patch @ 4618:de2eedecd6ba
update broken PKG_UPDATE rules, handle missing update rules
* Makefile.in: add handling for packages with no update rule
* src/gtk2.mk, src/gtk3.mk, src/libvpx.mk, src/taglib.mk,
src/hunspell.mk, src/vala.mk : use github tags for version info
* src/llvm.mk: add '?' to update url
* src/openscenegraph.mk: update SED rule for version extraction
* src/pthread-stubs.mk, src/qt5.mk, src/renderproto.mk,
src/sm.mk, src/s2tc.mk, src/util-macros.mk: added dummy PKG_UPDATE rule
* src/qscintilla.mk: change search name for version extraction
* src/qtbase.mk: use short pkg version in update path
* src/suitesparse.mk: update change in main url/version url
* src/tre.mk: update download page link
* src/vmime.mk: update download and update url
* src/wget.mk, src/xapian-core.mk: update url, sed rule
* src/wt.mk: update to use github download/update
* src/src-msys-libcrypt.mk: update sed rule
author | John Donoghue |
---|---|
date | Fri, 09 Mar 2018 11:46:42 -0500 |
parents | a62c4469e2aa |
children |
line wrap: on
line source
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')