[87792] trunk/dports/python/py27-wxpython

jwa at macports.org jwa at macports.org
Tue Dec 6 02:33:24 PST 2011


Revision: 87792
          http://trac.macports.org/changeset/87792
Author:   jwa at macports.org
Date:     2011-12-06 02:33:24 -0800 (Tue, 06 Dec 2011)
Log Message:
-----------
correcting platform check,adding patch

Modified Paths:
--------------
    trunk/dports/python/py27-wxpython/Portfile

Added Paths:
-----------
    trunk/dports/python/py27-wxpython/files/
    trunk/dports/python/py27-wxpython/files/patch-config.py.diff

Modified: trunk/dports/python/py27-wxpython/Portfile
===================================================================
--- trunk/dports/python/py27-wxpython/Portfile	2011-12-06 08:00:21 UTC (rev 87791)
+++ trunk/dports/python/py27-wxpython/Portfile	2011-12-06 10:33:24 UTC (rev 87792)
@@ -41,9 +41,8 @@
 
 destroot.env	UNICODE="1" WXPORT="mac" PATH="${prefix}/lib/wx/config:$env(PATH)"
 
-platform darwin 10 11 {
+if {${os.platform} == "darwin" && ${os.major} >= 10} {
     patchfiles		patch-config.py.diff
-#    build.env-append	CC="llvm-gcc-4.2" CXX="llvm-cpp-4.2" CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
 }
 
 post-destroot {

Added: trunk/dports/python/py27-wxpython/files/patch-config.py.diff
===================================================================
--- trunk/dports/python/py27-wxpython/files/patch-config.py.diff	                        (rev 0)
+++ trunk/dports/python/py27-wxpython/files/patch-config.py.diff	2011-12-06 10:33:24 UTC (rev 87792)
@@ -0,0 +1,27 @@
+--- config.py	2011-12-04 12:28:13.000000000 +0200
++++ config.py	2011-12-04 12:36:13.000000000 +0200
+@@ -1031,19 +1031,11 @@
+         GENDIR = 'mac'
+         libs = ['stdc++']
+         NO_SCRIPTS = 1
+-        if not ARCH == "":
+-            cflags.append("-arch")
+-            cflags.append(ARCH)
+-            lflags.append("-arch")
+-            lflags.append(ARCH)
+-            #if ARCH == "ppc":
+-            #    cflags.append("-isysroot")
+-            #    cflags.append("/Developer/SDKs/MacOSX10.3.9.sdk")
+-
+-        if not os.environ.get('CC') or not os.environ.get('CXX'):
+-            os.environ["CXX"] = "g++-4.0"
+-            os.environ["CC"]  = "gcc-4.0"
+-            os.environ["CPP"] = "cpp-4.0"
++        os.environ["CXX"] = "llvm-g++-4.2"
++        os.environ["CC"]  = "llvm-gcc-4.2"
++        os.environ["CPP"] = "llvm-cpp-4.2"
++        cflags.append("-isysroot")
++        cflags.append("/Developer/SDKs/MacOSX10.6.sdk")
+ 
+     else:
+         # Set flags for other Unix type platforms
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111206/9fa1ec91/attachment.html>


More information about the macports-changes mailing list