[110469] trunk/dports/python/py-wxpython-2.8/files/patch-config.py.diff
Revision: 110469 https://trac.macports.org/changeset/110469 Author: mojca@macports.org Date: 2013-08-31 01:35:29 -0700 (Sat, 31 Aug 2013) Log Message: ----------- py-wxpython-2.8: add missing import for the log module, untested (#35689) Modified Paths: -------------- trunk/dports/python/py-wxpython-2.8/files/patch-config.py.diff Modified: trunk/dports/python/py-wxpython-2.8/files/patch-config.py.diff =================================================================== --- trunk/dports/python/py-wxpython-2.8/files/patch-config.py.diff 2013-08-31 08:20:30 UTC (rev 110468) +++ trunk/dports/python/py-wxpython-2.8/files/patch-config.py.diff 2013-08-31 08:35:29 UTC (rev 110469) @@ -1,6 +1,28 @@ +first two patches: http://trac.wxwidgets.org/ticket/15462 +the rest is to make gtk work and for proper handling of arch & sdk flags --- config.py.orig +++ config.py -@@ -1024,27 +1024,16 @@ elif os.name == 'posix' or COMPILER == 'mingw32': +@@ -722,6 +722,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args): + build, without a way to remove an architecture. Furthermore GCC will + barf if multiple '-isysroot' arguments are present. + """ ++ from distutils import log + stripArch = stripSysroot = 0 + + compiler_so = list(compiler_so) +@@ -765,9 +766,9 @@ def _darwin_compiler_fixup(compiler_so, cc_args): + sysroot = compiler_so[idx+1] + + if sysroot and not os.path.isdir(sysroot): +- log.warn("Compiling with an SDK that doesn't seem to exist: %s", ++ log.warning("Compiling with an SDK that doesn't seem to exist: %s", + sysroot) +- log.warn("Please check your Xcode installation") ++ log.warning("Please check your Xcode installation") + + return compiler_so + +@@ -1024,27 +1025,16 @@ elif os.name == 'posix' or COMPILER == 'mingw32': WXRELEASE = os.popen(WX_CONFIG + ' --release').read()[:-1] WXPREFIX = os.popen(WX_CONFIG + ' --prefix').read()[:-1] @@ -35,7 +57,7 @@ else: # Set flags for other Unix type platforms GENDIR = WXPORT -@@ -1070,14 +1059,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32': +@@ -1070,14 +1060,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32': cflags += portcfg.split()
participants (1)
-
mojca@macports.org