haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MacOSX] wxPython patch revised for http://trac.wxwidgets.org/ticket/15957

This commit is contained in:
Marco Serantoni 2014-02-15 19:09:14 +01:00
parent fb9e5b94ca
commit 0e42a2ffd0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patches/wxpython-3.0.0_macosx_multiarch.patch
View File

@ -1,6 +1,6 @@
=== modified file 'wxPython/config.py' === modified file 'wxPython/config.py'
--- wxPython/config.py 2014-02-08 12:23:31 +0000 --- wxPython/config.py 2014-02-15 10:10:05 +0000
+++ wxPython/config.py 2014-02-08 13:58:07 +0000 +++ wxPython/config.py 2014-02-15 18:05:33 +0000
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
import sys, os, glob, fnmatch, tempfile import sys, os, glob, fnmatch, tempfile
@ -9,7 +9,7 @@
EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv
if not EGGing: if not EGGing:
@@ -1059,10 +1060,8 @@ @@ -1059,10 +1060,9 @@
libs = ['stdc++'] libs = ['stdc++']
NO_SCRIPTS = 1 NO_SCRIPTS = 1
if ARCH != "": if ARCH != "":
@ -17,8 +17,9 @@
- cflags.append(ARCH) - cflags.append(ARCH)
- lflags.append("-arch") - lflags.append("-arch")
- lflags.append(ARCH) - lflags.append(ARCH)
+ cflags.append("-arch " + re.sub(","," -arch ",ARCH)) + splitArch = "-arch " + re.sub(","," -arch ",ARCH)
+ #lflags.append("-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'): if not os.environ.get('CC') or not os.environ.get('CXX'):
os.environ["CXX"] = getWxConfigValue('--cxx') os.environ["CXX"] = getWxConfigValue('--cxx')