From 0e42a2ffd0ea3ffb1a8d3edd81cf1fa2b0b1e0f9 Mon Sep 17 00:00:00 2001 From: Marco Serantoni Date: Sat, 15 Feb 2014 19:09:14 +0100 Subject: [PATCH] =?UTF-8?q?[MacOSX]=C2=A0wxPython=20patch=20revised=20for?= =?UTF-8?q?=20http://trac.wxwidgets.org/ticket/15957?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches/wxpython-3.0.0_macosx_multiarch.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/patches/wxpython-3.0.0_macosx_multiarch.patch b/patches/wxpython-3.0.0_macosx_multiarch.patch index d3b70dd0ec..b3d39dc7cc 100644 --- a/patches/wxpython-3.0.0_macosx_multiarch.patch +++ b/patches/wxpython-3.0.0_macosx_multiarch.patch @@ -1,6 +1,6 @@ === modified file 'wxPython/config.py' ---- wxPython/config.py 2014-02-08 12:23:31 +0000 -+++ wxPython/config.py 2014-02-08 13:58:07 +0000 +--- wxPython/config.py 2014-02-15 10:10:05 +0000 ++++ wxPython/config.py 2014-02-15 18:05:33 +0000 @@ -22,6 +22,7 @@ import sys, os, glob, fnmatch, tempfile @@ -9,7 +9,7 @@ EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv if not EGGing: -@@ -1059,10 +1060,8 @@ +@@ -1059,10 +1060,9 @@ libs = ['stdc++'] NO_SCRIPTS = 1 if ARCH != "": @@ -17,8 +17,9 @@ - cflags.append(ARCH) - lflags.append("-arch") - lflags.append(ARCH) -+ cflags.append("-arch " + re.sub(","," -arch ",ARCH)) -+ #lflags.append("-arch " + re.sub(","," -arch ",ARCH)) ++ splitArch = "-arch " + re.sub(","," -arch ",ARCH) ++ cflags.extend(splitArch.split(' ')) ++ lflags.extend(splitArch.split(' ')) if not os.environ.get('CC') or not os.environ.get('CXX'): os.environ["CXX"] = getWxConfigValue('--cxx')